From 7d4d357931d43798f3beea2d97711cc4f3956381 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 11 七月 2024 17:58:57 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 101 +
server/service/src/main/java/com/doumee/dao/business/model/Member.java | 15
server/web/src/main/java/com/doumee/api/web/ApiController.java | 13
admin/vue.config.js | 2
admin/src/api/business/multifile.js | 5
admin/src/components/business/OperaNewsDzWindow.vue | 126 ++
admin/src/components/system/dict/OperaDictDataWindow.vue | 5
server/service/src/main/java/com/doumee/dao/business/SmsEmailMapper.java | 12
server/service/src/main/java/com/doumee/biz/zbom/model/CrmCustomerSubmmitModel.java | 19
server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java | 20
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 144 ++
server/service/src/main/java/com/doumee/service/business/BjParamService.java | 7
server/service/src/main/java/com/doumee/service/business/InitService.java | 4
server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java | 16
admin/.env.development | 1
admin/src/components/common/RichEditor.vue | 16
server/service/src/main/java/com/doumee/core/utils/tyyun/TyyZosUtil.java | 6
server/service/src/main/java/com/doumee/dao/business/model/Users.java | 20
server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 8
server/service/src/main/java/com/doumee/dao/web/reqeust/EditMemberRequest.java | 71 +
server/service/src/main/java/com/doumee/dao/business/model/BjParam.java | 4
server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java | 14
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 124 ++
server/service/src/main/java/com/doumee/service/business/SmsEmailService.java | 98 +
server/service/service.iml | 21
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java | 119 ++
server/service/src/main/resources/mappers/SystemDictDataMapper.xml | 4
server/service/src/main/java/com/doumee/biz/zbom/model/CrmCustomerInfoModel.java | 42
admin/src/components/business/OperaNewsWindow.vue | 172 ++-
server/service/src/main/java/com/doumee/core/wx/WxMiniConfig.java | 127 -
server/service/src/main/java/com/doumee/dao/business/model/News.java | 7
server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java | 69
server/service/src/main/java/com/doumee/dao/business/model/CrmInterfaceLog.java | 2
server/zbomyoujia.iml | 21
server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java | 19
server/service/src/main/java/com/doumee/core/utils/QrCodeUtils.java | 5
server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 231 ++++
server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 93 +
admin/src/views/business/categorySeg.vue | 127 -
server/service/src/main/java/com/doumee/dao/web/reqeust/WxPhoneRequest.java | 32
server/service/src/main/java/com/doumee/service/business/UsersService.java | 8
admin/src/components/common/upload.vue | 133 +-
server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java | 2
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 69 +
server/service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java | 19
server/service/src/main/java/com/doumee/biz/zbom/ZbomSMSService.java | 14
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 239 +++
server/service/src/main/java/com/doumee/service/business/MemberService.java | 29
server/service/src/main/java/com/doumee/dao/web/response/BjParamConfigResponse.java | 29
admin/src/views/business/newsDz.vue | 32
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomSMSServiceImpl.java | 114 ++
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java | 38
server/admin/src/main/java/com/doumee/api/business/PushController.java | 2
server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java | 10
server/web/web.iml | 21
admin/src/views/business/shop.vue | 6
/dev/null | 0
admin/src/views/business/news.vue | 57
server/pom.xml | 12
server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java | 3
server/admin/admin.iml | 21
admin/src/components/system/dict/DictDataManagerWindow.vue | 5
admin/src/views/business/shopUsers.vue | 133 +-
server/service/src/main/java/com/doumee/dao/web/response/AccountResponse.java | 32
server/service/src/main/java/com/doumee/dao/business/model/Multifile.java | 8
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java | 222 +++
67 files changed, 2,580 insertions(+), 622 deletions(-)
diff --git a/.idea/libraries/Maven__com_github_binarywang_weixin_java_common_3_6_0.xml b/.idea/libraries/Maven__com_github_binarywang_weixin_java_common_3_6_0.xml
deleted file mode 100644
index f591e42..0000000
--- a/.idea/libraries/Maven__com_github_binarywang_weixin_java_common_3_6_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: com.github.binarywang:weixin-java-common:3.6.0">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/binarywang/weixin-java-common/3.6.0/weixin-java-common-3.6.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/binarywang/weixin-java-common/3.6.0/weixin-java-common-3.6.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/binarywang/weixin-java-common/3.6.0/weixin-java-common-3.6.0-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml b/.idea/libraries/Maven__com_google_guava_guava_20_0.xml
deleted file mode 100644
index 00e464b..0000000
--- a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: com.google.guava:guava:20.0">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/google/guava/guava/20.0/guava-20.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/google/guava/guava/20.0/guava-20.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/google/guava/guava/20.0/guava-20.0-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11.xml b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11.xml
deleted file mode 100644
index 564ac37..0000000
--- a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: com.thoughtworks.xstream:xstream:1.4.11">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/thoughtworks/xstream/xstream/1.4.11/xstream-1.4.11.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/thoughtworks/xstream/xstream/1.4.11/xstream-1.4.11-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/thoughtworks/xstream/xstream/1.4.11/xstream-1.4.11-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml b/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml
deleted file mode 100644
index 8a97cea..0000000
--- a/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: org.dom4j:dom4j:2.1.1">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/org/dom4j/dom4j/2.1.1/dom4j-2.1.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/org/dom4j/dom4j/2.1.1/dom4j-2.1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/org/dom4j/dom4j/2.1.1/dom4j-2.1.1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml
deleted file mode 100644
index 70d61e5..0000000
--- a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: xpp3:xpp3_min:1.1.4c">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/admin/.env.development b/admin/.env.development
index 313f893..aa3a833 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,2 +1,3 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
+VUE_APP_BASE_API = 'http://localhost:10028'
diff --git a/admin/src/api/business/multifile.js b/admin/src/api/business/multifile.js
index 1fd3d9d..059a8a0 100644
--- a/admin/src/api/business/multifile.js
+++ b/admin/src/api/business/multifile.js
@@ -15,6 +15,11 @@
})
}
+export function uploadFile (data) {
+ return request.post('/public/upload', data, {
+ trim: true
+ })
+}
// 鍒涘缓
export function create (data) {
return request.post('/business/multifile/create', data)
diff --git a/admin/src/components/business/OperaNewsDzWindow.vue b/admin/src/components/business/OperaNewsDzWindow.vue
new file mode 100644
index 0000000..2382ff8
--- /dev/null
+++ b/admin/src/components/business/OperaNewsDzWindow.vue
@@ -0,0 +1,126 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="60%"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="鏍囬" prop="title" required>
+ <el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍓爣棰�" prop="subTitle">
+ <el-input type="textarea" v-model="form.subTitle" placeholder="璇疯緭鍏ュ壇鏍囬" v-trim maxLength="200" />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="status" required>
+ <el-radio-group v-model="form.status" >
+ <el-radio :label="0" >灞曠ず</el-radio>
+ <el-radio :label="1">涓嶅睍绀�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="鍒楄〃鍥�/瑙嗛" prop="files" >
+ <upload width="100px" height="100px" :max-length="1" @dele="delFile" :list="form.fileList" accept=".png,.jpg,.jpeg,.mp4" folder="news" @loading="loading = true" @success="fileResult($event)" />
+ </el-form-item>
+ <el-form-item label="璺宠浆绫诲瀷" prop="linkType" required>
+ <el-radio-group v-model="form.linkType" >
+ <el-radio :label="0" >瀵屾枃鏈�</el-radio>
+ <el-radio :label="1">澶栭摼</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item :label="form.linkType == 1?'澶栬仈鍦板潃':'鍐呭'" prop="content">
+ <RichEditor v-if="form.linkType != 1" :richData="form.content" :styleEditor="'border: 1px solid #ccc;display: inline-block;'" @getWangedditor="getWangedditor" :readonly="false"/>
+ <el-input v-else v-model="form.content" type="tex" placeholder="璇疯緭鍏ュ娉�" v-trim/>
+ </el-form-item>
+
+ <el-form-item label="鎺掑簭鐮侊紙鍗囧簭锛�" prop="sortnum">
+ <el-input v-model="form.sortnum" type="number" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="form.remark" type="tex" placeholder="璇疯緭鍏ュ娉�" v-trim/>
+ </el-form-item>
+ </el-form>
+ </GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import RichEditor from '@/components/common/RichEditor'
+import upload from '@/components/common/upload'
+export default {
+ name: 'OperaNewsWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow, RichEditor, upload },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ remark: '',
+ title: '',
+ subTitle: '',
+ sortnum: '',
+ content: '',
+ linkType: 0,
+ status: 0,
+ fileList: [],
+ type: 1
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ title: [{ required: true, message: '璇疯緭鍏ユ爣棰�' }],
+ status: [{ required: true, message: '璇烽�夋嫨鐘舵��' }],
+ linkType: [{ required: true, message: '璇烽�夋嫨璺宠浆绫诲瀷' }]
+ }
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/news',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ getWangedditor (val) {
+ this.form.content = val
+ },
+ open (title, target) {
+ this.title = title
+ this.visible = true
+ this.form.fileList = []
+ // 鏂板缓
+ if (target == null) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form[this.configData['field.id']] = null
+ })
+ return
+ }
+ // 缂栬緫
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ this.form.fileType = target.fileType || 0
+ const files = target.fileList || []
+ if (files.length > 0) {
+ this.form.fileList.push(files[0])
+ }
+ })
+ },
+ delFile (index) {
+ this.form.fileList.splice(index, 1)
+ },
+ fileResult (e) {
+ this.form.fileList = this.form.fileList || []
+ this.form.fileList.push({
+ fileurlFull: e.url,
+ fileurl: e.imgaddr,
+ name: e.originname,
+ type: e.type
+ })
+ }
+ }
+}
+</script>
diff --git a/admin/src/components/business/OperaNewsWindow.vue b/admin/src/components/business/OperaNewsWindow.vue
index 9db6ae7..548f327 100644
--- a/admin/src/components/business/OperaNewsWindow.vue
+++ b/admin/src/components/business/OperaNewsWindow.vue
@@ -1,102 +1,82 @@
<template>
<GlobalWindow
:title="title"
+ width="60%"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" v-trim/>
+ <el-form-item label="鏂囨" prop="title" required>
+ <el-input type="textarea" v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim maxlength="200"/>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="form.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"></el-date-picker>
+ <el-form-item label="鍙戝竷鏃堕棿" prop="publishDate" required>
+ <el-date-picker
+ v-model="form.publishDate"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃堕棿">
+ </el-date-picker>
</el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="form.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" v-trim/>
+ <el-form-item label="鐘舵��" prop="status" required>
+ <el-radio-group v-model="form.status" >
+ <el-radio :label="0" >灞曠ず</el-radio>
+ <el-radio :label="1">涓嶅睍绀�</el-radio>
+ </el-radio-group>
</el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="form.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�"></el-date-picker>
+ <el-form-item label="闄勪欢绫诲瀷" prop="fileType" required>
+ <el-radio-group v-model="form.fileType" >
+ <el-radio :label="0" >鍥剧墖</el-radio>
+ <el-radio :label="1">瑙嗛</el-radio>
+ </el-radio-group>
</el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="form.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" v-trim/>
+ <el-form-item label="鍥鹃泦涓婁紶 锛堟渶澶�9寮狅級" v-if="form.fileType !=1">
+ <upload width="100px" height="100px" :max-length="9" @dele="delFile" :list="fileImgList" accept=".png,.jpg,.jpeg" folder="news" @loading="loading = true" @success="fileResult($event)" />
</el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" v-trim/>
+ <el-form-item label="瑙嗛涓婁紶锛堝崟涓級" v-if="form.fileType === 1">
+ <upload width="100px" height="100px" :max-length="1" @dele="delFile" :list="fileVideoList" accept=".mp4" folder="news" @loading="loading = true" @success="fileResult($event)" />
</el-form-item>
- <el-form-item label="鏍囬" prop="title">
- <el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim/>
+ <el-form-item label="鎺掑簭鐮侊紙鍗囧簭锛�" prop="sortnum">
+ <el-input v-model="form.sortnum" type="number" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
</el-form-item>
- <el-form-item label="鍓爣棰�" prop="subTitle">
- <el-input v-model="form.subTitle" placeholder="璇疯緭鍏ュ壇鏍囬" v-trim/>
- </el-form-item>
- <el-form-item label="鎺掑簭鐮�" prop="sortnum">
- <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
- </el-form-item>
- <el-form-item label="鍐呭" prop="content">
- <el-input v-model="form.content" placeholder="璇疯緭鍏ュ唴瀹�" v-trim/>
- </el-form-item>
- <el-form-item label="璺宠浆绫诲瀷 0瀵屾枃鏈� 1澶栭摼" prop="linkType">
- <el-input v-model="form.linkType" placeholder="璇疯緭鍏ヨ烦杞被鍨� 0瀵屾枃鏈� 1澶栭摼" v-trim/>
- </el-form-item>
- <el-form-item label="鐘舵�� 0灞曠ず 1涓嶅睍绀�" prop="status">
- <el-input v-model="form.status" placeholder="璇疯緭鍏ョ姸鎬� 0灞曠ず 1涓嶅睍绀�" v-trim/>
- </el-form-item>
- <el-form-item label="娴忚閲�" prop="lookNum">
- <el-input v-model="form.lookNum" placeholder="璇疯緭鍏ユ祻瑙堥噺" v-trim/>
- </el-form-item>
- <el-form-item label="涓嬭浇閲�" prop="donwloadNum">
- <el-input v-model="form.donwloadNum" placeholder="璇疯緭鍏ヤ笅杞介噺" v-trim/>
- </el-form-item>
- <el-form-item label="鏈�杩戝彂甯冩椂闂�" prop="publishDate">
- <el-date-picker v-model="form.publishDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ渶杩戝彂甯冩椂闂�"></el-date-picker>
- </el-form-item>
- <el-form-item label="鏈�杩戝彂甯冧汉浜虹紪鐮�(鍏宠仈system_user)" prop="publishUserid">
- <el-input v-model="form.publishUserid" placeholder="璇疯緭鍏ユ渶杩戝彂甯冧汉浜虹紪鐮�(鍏宠仈system_user)" v-trim/>
- </el-form-item>
- <el-form-item label="鏈�杩戝彂甯冨娉�" prop="publishInfo">
- <el-input v-model="form.publishInfo" placeholder="璇疯緭鍏ユ渶杩戝彂甯冨娉�" v-trim/>
- </el-form-item>
- <el-form-item label="绱犳潗绫诲瀷 0鎺ㄥ箍璧勮 1瀹氬埗鏈嶅姟" prop="type">
- <el-input v-model="form.type" placeholder="璇疯緭鍏ョ礌鏉愮被鍨� 0鎺ㄥ箍璧勮 1瀹氬埗鏈嶅姟" v-trim/>
+ <el-form-item label="澶囨敞" prop="publishInfo">
+ <el-input type="textarea" v-model="form.publishInfo" placeholder="璇疯緭鍏ュ彂甯冨娉�" v-trim/>
</el-form-item>
</el-form>
</GlobalWindow>
</template>
-
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+import upload from '@/components/common/upload'
export default {
name: 'OperaNewsWindow',
extends: BaseOpera,
- components: { GlobalWindow },
+ components: { GlobalWindow, upload },
data () {
return {
// 琛ㄥ崟鏁版嵁
+ loading: false,
form: {
id: null,
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- remark: '',
title: '',
- subTitle: '',
sortnum: '',
- content: '',
- linkType: '',
- status: '',
- lookNum: '',
- donwloadNum: '',
+ status: 0,
publishDate: '',
- publishUserid: '',
publishInfo: '',
- type: ''
+ fileList: [],
+ fileType: 0,
+ type: 0
},
+ fileImgList: [],
+ fileVideoList: [],
// 楠岃瘉瑙勫垯
rules: {
+ title: [{ required: true, message: '璇疯緭鍏ユ枃妗�' }],
+ publishDate: [{ required: true, message: '璇烽�夋嫨鍙戝竷鏃堕棿' }],
+ status: [{ required: true, message: '璇烽�夋嫨鐘舵��' }],
+ fileType: [{ required: true, message: '璇烽�夋嫨闄勪欢绫诲瀷' }]
}
}
},
@@ -105,6 +85,74 @@
api: '/business/news',
'field.id': 'id'
})
+ },
+ methods: {
+ open (title, target) {
+ this.title = title
+ this.visible = true
+ this.form.fileList = []
+ this.fileImgList= []
+ this.fileVideoList = []
+ // 鏂板缓
+ if (target == null) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form[this.configData['field.id']] = null
+ })
+ return
+ }
+ // 缂栬緫
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ this.form.fileType = target.fileType || 0
+ const files = target.fileList || []
+ if(target.fileType === 1){
+ if(files.length>0){
+ this.fileVideoList.push(files[0])
+ }
+ }else {
+ files.forEach(item => {
+ this.fileImgList.push(item)
+ })
+ }
+ })
+ },
+ getWangedditor (val) {
+ this.form.content = val
+ },
+ delFile (index) {
+ if(this.form.fileType === 1){
+ this.fileVideoList.splice(index, 1)
+ this.form.fileList =this.fileVideoList
+ }else{
+ this.fileImgList.splice(index, 1)
+ this.form.fileList =this.fileImgList
+ }
+ },
+ fileResult (e) {
+ if(this.form.fileType === 1){
+ this.fileVideoList = this.fileVideoList||[]
+ this.fileVideoList.push({
+ fileurlFull: e.url,
+ fileurl: e.imgaddr,
+ name: e.originname,
+ type: e.type
+ })
+ this.form.fileList =this.fileVideoList
+ }else{
+ this.fileImgList = this.fileImgList||[]
+ this.fileImgList.push({
+ fileurlFull: e.url,
+ fileurl: e.imgaddr,
+ name: e.originname,
+ type: e.type
+ })
+ this.form.fileList =this.fileImgList
+ }
+ console.log(this.form.fileList)
+ }
}
}
</script>
diff --git a/admin/src/components/common/RichEditor.vue b/admin/src/components/common/RichEditor.vue
index bdcf1bf..5aeb4bf 100644
--- a/admin/src/components/common/RichEditor.vue
+++ b/admin/src/components/common/RichEditor.vue
@@ -85,7 +85,7 @@
] // 涓嬬骇鑿滃崟 key 锛屽繀濉�
},*/
// 涓婁紶鍥剧墖鍒嗙粍
- /* {
+ {
key: 'img-style', // 蹇呭～锛岃浠� group 寮�澶�
title: '鍥剧墖', // 蹇呭～
// iconSvg: '<svg>....</svg>', // 鍙��
@@ -98,9 +98,9 @@
"imageWidth50", // 鍥剧墖瀹藉害鐩稿浜庣紪杈戝櫒瀹藉害鐨勭櫨鍒嗘瘮50
"imageWidth100", // 鍥剧墖瀹藉害鐩稿浜庣紪杈戝櫒瀹藉害鐨勭櫨鍒嗘瘮100
] // 涓嬬骇鑿滃崟 key 锛屽繀濉�
- },*/
+ },
// 瑙嗛鍒嗙粍
- /* {
+ {
key: 'video-style', // 蹇呭～锛岃浠� group 寮�澶�
title: '瑙嗛', // 蹇呭～
// iconSvg: '<svg>....</svg>', // 鍙��
@@ -109,7 +109,7 @@
"uploadVideo", // 涓婁紶瑙嗛
"editVideoSize", // 淇敼瑙嗛灏哄
] // 涓嬬骇鑿滃崟 key 锛屽繀濉�
- },*/
+ },
"fullScreen", // 鍏ㄥ睆
],
excludeKeys: [ // 闅愯棌鎸囧畾鐨勮彍鍗曢」
@@ -128,7 +128,7 @@
MENU_CONF: {
// 鍥剧墖涓婁紶
uploadImage: {
- server: process.env.VUE_APP_BASE_API + "/common/upload",
+ server: process.env.VUE_APP_API_PREFIX + '/public/upload?folder=richeditor',
fieldName: 'file',
// 鍗曚釜鏂囦欢鐨勬渶澶т綋绉檺鍒讹紝榛樿涓� 2M
maxFileSize: 10 * 1024 * 1024, // 10M
@@ -177,7 +177,7 @@
// message: `${res.data.originalName} 涓婁紶澶辫触锛岃閲嶆柊灏濊瘯`
// });
}
- insertFn(res.url, res.originalFilename, res.newFileName);
+ insertFn(res.data.url, res.data.originname, res.data.imgname);
},
// 鍗曚釜鏂囦欢涓婁紶鎴愬姛涔嬪悗
@@ -201,7 +201,7 @@
// 瑙嗛涓婁紶
uploadVideo: {
fieldName: 'file',
- server: process.env.VUE_APP_BASE_API + "/common/upload",
+ server: process.env.VUE_APP_API_PREFIX + '/public/upload?folder=richeditor',
// 鍗曚釜鏂囦欢鐨勬渶澶т綋绉檺鍒讹紝榛樿涓� 10M
maxFileSize: 50 * 1024 * 1024, // 50M
// 鏈�澶氬彲涓婁紶鍑犱釜鏂囦欢锛岄粯璁や负 5
@@ -243,7 +243,7 @@
// message: `${res.data.originalName} 涓婁紶澶辫触锛岃閲嶆柊灏濊瘯`
// });
}
- insertFn(res.data.link, res.data.link);
+ insertFn(res.data.url, res.data.url);
},
// 涓婁紶杩涘害鐨勫洖璋冨嚱鏁�
onProgress(progress) {
diff --git a/admin/src/components/common/upload.vue b/admin/src/components/common/upload.vue
index 22d22f9..62a855f 100644
--- a/admin/src/components/common/upload.vue
+++ b/admin/src/components/common/upload.vue
@@ -5,79 +5,82 @@
<div class="dele" @click="deleItem(index)">
<i class="el-icon-close"></i>
</div>
- <img :src="item.url" v-if="fileType(item.url) === 'img'" />
- <video controls autoplay :src="item.url" v-else></video>
+ <img :src="item.fileurlFull" v-if="fileType(item.fileurlFull) === 'img'" />
+ <video controls autoplay :src="item.fileurlFull" v-else></video>
</div>
- <div class="file_list_item" :style="{width: width, height: height, cursor: 'pointer'}" @click="$refs.file.click()">
+ <div v-if="list ==null || list.length == 0 || list.length < maxLength" class="file_list_item" :style="{width: width, height: height, cursor: 'pointer'}" @click="$refs.file.click()">
<i class="el-icon-plus"></i>
</div>
</div>
- <input type="file" ref="file" :accept="accept" @change="getFile" />
+ <input type="file" ref="file" :accept="accept" @change="getFile" />
</div>
</template>
<script>
- import axios from 'axios';
- export default {
- props: {
- width: {
- type: String,
- default: '90px'
- },
- height: {
- type: String,
- default: '90px'
- },
- list: {
- type: Array,
- default: []
- },
- accept: {
- type: String,
- default: ''
- },
- folder: {
- type: String,
- default: ''
- }
- },
- data() {
- return {
- uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
- }
- },
-
- methods: {
- fileType(url) {
- if (url.indexOf('.mp4') !== -1) {
- return 'video'
- } else {
- return 'img'
- }
- },
- getFile(e) {
- if (e.target && e.target.files.length > 0) {
- this.$emit('loading')
- const formdate = new FormData()
- formdate.append('file', e.target.files[0])
- formdate.append('folder', this.folder)
- axios.post(this.uploadImgUrl, formdate)
- .then(res => {
- this.$emit('success', res.data.data)
- })
- .catch(e => {
- this.$message.error(e)
- })
- .finally(() => {
- this.$refs.file.value = null
- })
- }
- },
- deleItem(index) {
- this.$emit('dele', index)
- }
- }
+import axios from 'axios'
+export default {
+ props: {
+ width: {
+ type: String,
+ default: '90px'
+ },
+ height: {
+ type: String,
+ default: '90px'
+ },
+ list: {
+ type: Array,
+ default: []
+ },
+ accept: {
+ type: String,
+ default: ''
+ },
+ folder: {
+ type: String,
+ default: ''
+ },
+ maxLength: {
+ type: Number,
+ default: 9999
}
+ },
+ data () {
+ return {
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload'
+ }
+ },
+ methods: {
+ fileType (url) {
+ if (url && url.indexOf('.mp4') !== -1) {
+ return 'video'
+ } else {
+ return 'img'
+ }
+ },
+ getFile (e) {
+ if (e.target && e.target.files.length > 0) {
+ this.$emit('loading')
+ const formdate = new FormData()
+ formdate.append('file', e.target.files[0])
+ formdate.append('folder', this.folder)
+ axios.post(this.uploadImgUrl, formdate)
+ .then(res => {
+ this.$emit('success', res.data.data)
+ })
+ .catch(e => {
+ this.$message.error(e)
+ })
+ .finally(() => {
+ this.$refs.file.value = null
+ })
+ }
+ },
+ deleItem (index) {
+ this.$emit('dele', index)
+ }
+ }
+}
</script>
<style lang="scss" scoped>
@@ -108,6 +111,7 @@
margin: 0 !important;
}
.dele {
+ z-index: 10000;
position: absolute;
right: 0;
top: 0;
@@ -138,4 +142,3 @@
}
}
</style>
-
diff --git a/admin/src/components/system/dict/DictDataManagerWindow.vue b/admin/src/components/system/dict/DictDataManagerWindow.vue
index 86c092a..26b133a 100644
--- a/admin/src/components/system/dict/DictDataManagerWindow.vue
+++ b/admin/src/components/system/dict/DictDataManagerWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="dictName + '鏁版嵁绠＄悊'"
- width="78%"
+ width="100%"
:visible.sync="visible"
:with-footer="false"
>
@@ -19,7 +19,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="label" label="鏁版嵁鏍囩" min-width="100px"></el-table-column>
+ <el-table-column prop="label" label="鏁版嵁鏍囩" min-width="200px"></el-table-column>
<el-table-column prop="code" label="鏁版嵁鍊�" min-width="100px">
<template slot-scope="{row}">
<div v-if="row.code || row.code.length>500" >
@@ -37,6 +37,7 @@
<el-table-column prop="updateUser" label="鏇存柊浜�" min-width="100px">
<template slot-scope="{row}">{{row.updateUserInfo == null ? '' : row.updateUserInfo.username}}</template>
</el-table-column>
+ <el-table-column prop="remark" label="璇存槑" min-width="150px"></el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
diff --git a/admin/src/components/system/dict/OperaDictDataWindow.vue b/admin/src/components/system/dict/OperaDictDataWindow.vue
index ec5ba6a..65caa88 100644
--- a/admin/src/components/system/dict/OperaDictDataWindow.vue
+++ b/admin/src/components/system/dict/OperaDictDataWindow.vue
@@ -21,6 +21,9 @@
<el-switch v-model="form.disabled" :active-value="false" :inactive-value="true"/>
<span class="status-text">{{form.disabled | disabledText}}</span>
</el-form-item>
+ <el-form-item label="璇存槑" prop="remark">
+ <el-input v-model="form.remark" placeholder="璇疯緭鍏ユ暟鎹鏄�" v-trim />
+ </el-form-item>
</el-form>
</GlobalWindow>
</template>
@@ -43,6 +46,7 @@
code: '',
label: '',
disabled: false,
+ remark: '',
istext: false
},
// 楠岃瘉瑙勫垯
@@ -68,6 +72,7 @@
open (title, dictId, target) {
this.title = title
this.visible = true
+ this.form.remark=''
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
diff --git a/admin/src/views/business/categorySeg.vue b/admin/src/views/business/categorySeg.vue
index 185d9f2..1057634 100644
--- a/admin/src/views/business/categorySeg.vue
+++ b/admin/src/views/business/categorySeg.vue
@@ -2,38 +2,16 @@
<TableLayout :permissions="['business:categoryseg:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="涓婚敭" prop="id">
- <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
- <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
- <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
- <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
<el-form-item label="鍝佺被缂栫爜" prop="unitCode">
- <el-input v-model="searchForm.unitCode" placeholder="璇疯緭鍏ュ搧绫荤紪鐮�" @keypress.enter.native="search"></el-input>
+ <el-select v-model="searchForm.unitCode" @change="search" clearable placeholder="鎵�灞炲搧鐗�">
+ <el-option v-for="(item) in unitList " :key="item.code" :label="item.name" :value="item.code"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="鎴樺尯缂栫爜" prop="segId">
- <el-input v-model="searchForm.segId" placeholder="璇疯緭鍏ユ垬鍖虹紪鐮�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="F鐮�" prop="orgId">
+ <el-input v-model="searchForm.orgId" placeholder="璇疯緭鍏鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鐪佸尯缂栫爜" prop="segId2">
- <el-input v-model="searchForm.segId2" placeholder="璇疯緭鍏ョ渷鍖虹紪鐮�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="甯傚尯缂栫爜" prop="segId3">
- <el-input v-model="searchForm.segId3" placeholder="璇疯緭鍏ュ競鍖虹紪鐮�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="S鐮�" prop="scode">
+ <el-input v-model="searchForm.scode" placeholder="璇疯緭鍏鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎴樺尯鍚嶇О" prop="segName">
<el-input v-model="searchForm.segName" placeholder="璇疯緭鍏ユ垬鍖哄悕绉�" @keypress.enter.native="search"></el-input>
@@ -43,15 +21,6 @@
</el-form-item>
<el-form-item label="甯傚尯鍚嶇О" prop="segName3">
<el-input v-model="searchForm.segName3" placeholder="璇疯緭鍏ュ競鍖哄悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏈�杩戝悓姝ユ椂闂�" prop="syncDate">
- <el-date-picker v-model="searchForm.syncDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ渶杩戝悓姝ユ椂闂�" @change="search"/>
- </el-form-item>
- <el-form-item label="鏈�杩戝悓姝ュ娉�" prop="syncInfo">
- <el-input v-model="searchForm.syncInfo" placeholder="璇疯緭鍏ユ渶杩戝悓姝ュ娉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏀惰揣鍦板潃" prop="shipToAddress">
- <el-input v-model="searchForm.shipToAddress" placeholder="璇疯緭鍏ユ敹璐у湴鍧�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鏀惰揣浜�" prop="shipToPerson">
<el-input v-model="searchForm.shipToPerson" placeholder="璇疯緭鍏ユ敹璐т汉" @keypress.enter.native="search"></el-input>
@@ -67,47 +36,33 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:categoryseg:create', 'business:categoryseg:delete']">
- <li><el-button type="primary" @click="$refs.operaCategorySegWindow.open('鏂板缓蹇楅偊钀ラ攢鍖哄煙鍝佺被淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:categoryseg:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:categoryseg:delete']">鍒犻櫎</el-button></li>
- </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
stripe
@selection-change="handleSelectionChange"
>
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
- <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="unitCode" label="鍝佺被缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="segId" label="鎴樺尯缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="segId2" label="鐪佸尯缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="segId3" label="甯傚尯缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="segName" label="鎴樺尯鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="segName2" label="鐪佸尯鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="segName3" label="甯傚尯鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="syncDate" label="鏈�杩戝悓姝ユ椂闂�" min-width="100px"></el-table-column>
- <el-table-column prop="syncInfo" label="鏈�杩戝悓姝ュ娉�" min-width="100px"></el-table-column>
- <el-table-column prop="shipToAddress" label="鏀惰揣鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="shipToPerson" label="鏀惰揣浜�" min-width="100px"></el-table-column>
- <el-table-column prop="shipToPhone" label="鏀惰揣浜虹數璇�" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:categoryseg:update', 'business:categoryseg:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaCategorySegWindow.open('缂栬緫蹇楅偊钀ラ攢鍖哄煙鍝佺被淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:categoryseg:update']">缂栬緫</el-button>
- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:categoryseg:delete']">鍒犻櫎</el-button>
- </template>
+ <el-table-column type="selection" width="55" fixed></el-table-column>
+ <el-table-column label="S鐮�" prop="scode" fixed min-width="80px"></el-table-column>
+ <el-table-column label="涓�浣撳晢" prop="sname" fixed min-width="180px"></el-table-column>
+ <el-table-column label="F鐮�" prop="orgId" fixed min-width="80px"></el-table-column>
+ <el-table-column label="鍔犵洘鍟�" prop="orgName" fixed min-width="180px"></el-table-column>
+ <el-table-column prop="unitCode" label="鍝佺被" min-width="150px">
+ <template slot-scope="{row}"> {{row.unitCode}} / {{row.unitName}}</template>
</el-table-column>
+ <el-table-column prop="segId" label="鎴樺尯" min-width="150px">
+ <template slot-scope="{row}"> {{row.segId}} / {{row.segName}}</template>
+ </el-table-column>
+ <el-table-column prop="segId2" label="鐪佸尯" min-width="150px">
+ <template slot-scope="{row}"> {{row.segId2}} / {{row.segName2}}</template>
+ </el-table-column>
+ <el-table-column prop="segId3" label="鐗囧尯" min-width="150px">
+ <template slot-scope="{row}"> {{row.segId3}} / {{row.segName3}}</template>
+ </el-table-column>
+ <el-table-column prop="shipToPerson" label="鏀惰揣浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="shipToPhone" label="鏀惰揣浜虹數璇�" min-width="120px"></el-table-column>
+ <el-table-column prop="shipToAddress" label="鏀惰揣鍦板潃" min-width="250px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="150px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -126,33 +81,22 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCategorySegWindow from '@/components/business/OperaCategorySegWindow'
+import { getUnitList } from '@/api/business/segments'
export default {
name: 'CategorySeg',
extends: BaseTable,
components: { TableLayout, Pagination, OperaCategorySegWindow },
data () {
return {
+ unitList:[],
// 鎼滅储
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- remark: '',
unitCode: '',
- segId: '',
- segId2: '',
- segId3: '',
segName: '',
segName2: '',
segName3: '',
- syncDate: '',
- syncInfo: '',
- shipToAddress: '',
- shipToPerson: '',
- shipToPhone: ''
+ scode: '',
+ orgId: ''
}
}
},
@@ -163,7 +107,16 @@
'field.id': 'id',
'field.main': 'id'
})
+ this.loadUnitList()
this.search()
+ },
+ methods: {
+ loadUnitList () {
+ getUnitList()
+ .then(data => {
+ this.unitList = data
+ })
+ }
}
}
</script>
diff --git a/admin/src/views/business/news.vue b/admin/src/views/business/news.vue
index e42bac7..099963d 100644
--- a/admin/src/views/business/news.vue
+++ b/admin/src/views/business/news.vue
@@ -20,7 +20,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:news:create', 'business:news:delete']">
- <li><el-button type="primary" @click="$refs.operaNewsWindow.open('鏂板缓璧勮鍜屽畾鍒舵湇鍔′俊鎭〃')" icon="el-icon-plus" v-permissions="['business:news:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaNewsWindow.open('鏂板缓鎺ㄥ箍璧勮')" icon="el-icon-plus" v-permissions="['business:news:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:news:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -30,29 +30,38 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="subTitle" label="鍓爣棰�" min-width="100px"></el-table-column>
- <el-table-column prop="linkType" label="璺宠浆绫诲瀷" min-width="100px">
+ <el-table-column prop="title" label="鏂囨" fixed min-width="300px"></el-table-column>
+ <el-table-column prop="fileList" label="闄勪欢" align="center" fixed min-width="250px">>
<template slot-scope="{row}">
- <span v-if="row.linkType ==0">瀵屾枃鏈�</span>
- <span v-if="row.linkType ==1">澶栭摼</span>
+ <div v-if="row.fileType!=1 && row.fileList!=null && row.fileList.length" class="image-container">
+ <div v-for="(item) in row.fileList" :key="item.id" >
+ <el-image
+ v-if="item.fileurlFull && item.type !=1"
+ class="image-item"
+ :src="item.fileurlFull"
+ fit="fill"
+ :preview-src-list="[item.fileurlFull]">
+ </el-image>
+ </div>
+ </div>
+ <div v-if="row.fileType == 1 && row.fileList!=null && row.fileList.length" class="image-container">
+ <video v-if="row.fileList[0].fileurlFull" style="width: 60px;height: 60px" controls autoplay :src="row.fileList[0].fileurlFull"></video>
+ </div>
</template>
</el-table-column>
- <el-table-column prop="status" label="鐘舵��" min-width="100px">
+ <el-table-column prop="publishDate" label="鍙戝竷鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="status" label="鐘舵��" min-width="80px">
<template slot-scope="{row}">
- <span v-if="row.status ==1">涓嶅睍绀�</span>
- <span v-if="row.status ==0">灞曠ず</span>
+ <span v-if="row.status ==1" style="color:red;">涓嶅睍绀�</span>
+ <span v-if="row.status ==0" style="color:green;">灞曠ず</span>
</template>
</el-table-column>
+ <el-table-column prop="publishInfo" label="鍙戝竷澶囨敞" min-width="150px"></el-table-column>
<el-table-column prop="lookNum" label="娴忚閲�" min-width="80px"></el-table-column>
<el-table-column prop="donwloadNum" label="涓嬭浇閲�" min-width="80px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
+ <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="80px"></el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="publishDate" label="鏈�杩戝彂甯冩椂闂�" min-width="100px"></el-table-column>
- <el-table-column prop="publishUserName" label="鏈�杩戝彂甯冧汉" min-width="100px"></el-table-column>
- <el-table-column prop="publishInfo" label="鏈�杩戝彂甯冨娉�" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:news:update', 'business:news:delete'])"
label="鎿嶄綔"
@@ -60,7 +69,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaNewsWindow.open('缂栬緫璧勮鍜屽畾鍒舵湇鍔′俊鎭〃', row)" icon="el-icon-edit" v-permissions="['business:news:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaNewsWindow.open('缂栬緫鎺ㄥ箍璧勮', row)" icon="el-icon-edit" v-permissions="['business:news:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:news:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -107,3 +116,19 @@
}
}
</script>
+
+<style scoped>
+.image-container {
+ display: flex; /* 璁惧畾涓� Flexbox 甯冨眬 */
+ flex-wrap: wrap; /* 鍏佽鎹㈣ */
+ justify-content: center; /* 姘村钩鏂瑰悜涓婄殑闂撮殧鍒嗗竷 */
+ align-items: flex-start; /* 鍨傜洿鏂瑰悜涓婄殑椤圭洰瀵归綈 */
+}
+
+.image-item {
+ height: 60px;
+ width: 60px;
+ margin-right: 10px; /* 鍙宠竟璺濓紝浣垮緱鍥剧墖涔嬮棿鏈夐棿闅� */
+ margin-bottom: 10px; /* 搴曢儴杈硅窛锛屼娇寰楀浘鐗囪兘澶熸崲琛� */
+}
+</style>
diff --git a/admin/src/views/business/newsDz.vue b/admin/src/views/business/newsDz.vue
index 6ced12e..6ff929b 100644
--- a/admin/src/views/business/newsDz.vue
+++ b/admin/src/views/business/newsDz.vue
@@ -20,7 +20,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:news:create', 'business:news:delete']">
- <li><el-button type="primary" @click="$refs.operaNewsWindow.open('鏂板缓璧勮鍜屽畾鍒舵湇鍔′俊鎭〃')" icon="el-icon-plus" v-permissions="['business:news:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaNewsWindow.open('鏂板缓瀹氬埗鏈嶅姟淇℃伅')" icon="el-icon-plus" v-permissions="['business:news:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:news:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
@@ -30,8 +30,22 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="subTitle" label="鍓爣棰�" min-width="100px"></el-table-column>
+ <el-table-column prop="title" label="鏍囬" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="subTitle" label="鍓爣棰�" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="fileList" label="闄勪欢" align="center" fixed min-width="100px">>
+ <template slot-scope="{row}">
+ <div v-if="row.fileList!=null && row.fileList.length" class="image-container">
+ <el-image
+ v-if="row.fileList[0].type !=1 && row.fileList[0].fileurlFull"
+ class="image-item"
+ :src="row.fileList[0].fileurlFull"
+ fit="fill"
+ :preview-src-list="[row.fileList[0].fileurlFull]">
+ </el-image>
+ <video v-if="row.fileList[0].type ==1 && row.fileList[0].fileurlFull" style="width: 60px;height: 60px" controls autoplay :src="row.fileList[0].fileurlFull"></video>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column prop="linkType" label="璺宠浆绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.linkType ==0">瀵屾枃鏈�</span>
@@ -45,14 +59,10 @@
</template>
</el-table-column>
<el-table-column prop="lookNum" label="娴忚閲�" min-width="80px"></el-table-column>
- <el-table-column prop="donwloadNum" label="涓嬭浇閲�" min-width="80px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="publishDate" label="鏈�杩戝彂甯冩椂闂�" min-width="100px"></el-table-column>
- <el-table-column prop="publishUserName" label="鏈�杩戝彂甯冧汉" min-width="100px"></el-table-column>
- <el-table-column prop="publishInfo" label="鏈�杩戝彂甯冨娉�" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:news:update', 'business:news:delete'])"
label="鎿嶄綔"
@@ -60,7 +70,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaNewsWindow.open('缂栬緫璧勮鍜屽畾鍒舵湇鍔′俊鎭〃', row)" icon="el-icon-edit" v-permissions="['business:news:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaNewsWindow.open('缂栬緫瀹氬埗鏈嶅姟淇℃伅', row)" icon="el-icon-edit" v-permissions="['business:news:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:news:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -73,7 +83,7 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaNewsWindow ref="operaNewsWindow" @success="handlePageChange"/>
+ <OperaNewsDzWindow ref="operaNewsWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -81,11 +91,11 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaNewsWindow from '@/components/business/OperaNewsWindow'
+import OperaNewsDzWindow from '@/components/business/OperaNewsDzWindow'
export default {
name: 'News',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaNewsWindow },
+ components: { TableLayout, Pagination, OperaNewsDzWindow },
data () {
return {
// 鎼滅储
diff --git a/admin/src/views/business/shop.vue b/admin/src/views/business/shop.vue
index 2c462bb..31878aa 100644
--- a/admin/src/views/business/shop.vue
+++ b/admin/src/views/business/shop.vue
@@ -20,11 +20,9 @@
</el-form-item>
<el-form-item label="涓�绾х粍缁囩被鍨�" prop="type">
<el-select v-model="searchForm.type" @change="search" clearable placeholder="涓�绾х粍缁囩被鍨�">
- <el-option label="涓�浣撳晢" value="1"></el-option>
+ <el-option label="HR" value="1"></el-option>
<el-option label="鍔犵洘鍟�" value="2"></el-option>
- <el-option label="搴楅潰" value="3"></el-option>
- <el-option label="閮ㄩ棬(HR/鍔�)" value="4"></el-option>
- <el-option label="铏氭嫙搴楅潰(鍔�/铏�)" value="5"></el-option>
+ <el-option label="铏氭嫙缁勭粐" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="浜岀骇缁勭粐绫诲瀷" prop="type">
diff --git a/admin/src/views/business/shopUsers.vue b/admin/src/views/business/shopUsers.vue
index 4d9b582..818c8a6 100644
--- a/admin/src/views/business/shopUsers.vue
+++ b/admin/src/views/business/shopUsers.vue
@@ -2,19 +2,26 @@
<TableLayout1 :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="" prop="keyword">
- <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
+ <el-form-item label="" prop="queryKeyword">
+ <el-input v-model="searchForm.queryKeyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="" prop="hasFace">
- <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" clearable placeholder="鏄惁鏈変汉鑴�">
- <el-option label="鏃�" value="0"></el-option>
- <el-option label="鏈�" value="1"></el-option>
+ <el-form-item label="" prop="iamUsername">
+ <el-input v-model="searchForm.iamUsername" placeholder="璇疯緭鍏ョ櫥褰曡处鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="shopType">
+ <el-select v-model="searchForm.shopType" @change="search" clearable placeholder="涓�绾х粍缁囩被鍨�">
+ <el-option label="HR" value="1"></el-option>
+ <el-option label="鍔犵洘鍟�" value="2"></el-option>
+ <el-option label="铏氭嫙缁勭粐" value="3"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="" prop="canVisit">
- <el-select v-model="searchForm.canVisit" clearable @keypress.enter.native="search" placeholder="鍙嫓璁�">
- <el-option label="鏄�" value="1"></el-option>
- <el-option label="鍚�" value="0"></el-option>
+ <el-form-item label="" prop="shopSecType">
+ <el-select v-model="searchForm.shopSecType" @change="search" clearable placeholder="浜岀骇缁勭粐绫诲瀷">
+ <el-option label="S" value="1"></el-option>
+ <el-option label="F" value="2"></el-option>
+ <el-option label="搴楅潰" value="3"></el-option>
+ <el-option label="閮ㄩ棬" value="4"></el-option>
+ <el-option label="铏氭嫙搴楅潰" value="5"></el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="status">
@@ -22,13 +29,6 @@
<el-option label="姝ｅ父" value="0"></el-option>
<el-option label="绂佺敤" value="1"></el-option>
<el-option label="鎷夐粦/鍐荤粨" value="2"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="hkStatus">
- <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" clearable placeholder="娴峰悍鍚屾鐘舵��">
- <el-option label="寰呭悓姝�" value="0"></el-option>
- <el-option label="鍚屾鎴愬姛" value="1"></el-option>
- <el-option label="鍚屾澶辫触" value="2"></el-option>
</el-select>
</el-form-item>
<section>
@@ -53,12 +53,13 @@
</template>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:member:delete','business:member:create,business:empower:create']">
- <li><el-button type="primary" @click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐',null,department,searchForm.companyType)" icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
+ <ul class="toolbar" style="height: 26px">
+<!-- <li><el-button type="primary" @click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐',null,department,searchForm.companyType)" icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
<li><el-button type="primary" @click="$refs.OperaMemberImportWindow.open('浜哄憳瀵煎叆',searchForm.companyType)" icon="el-icon-plus" v-permissions="['business:member:create']">浜哄憳瀵煎叆</el-button></li>
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
- <li style="float: right">
- <el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1" @change="search" >鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
+ -->
+ <li style="float: right;">
+ <el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1" @change="search" >鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
</li>
</ul>
<el-table
@@ -69,63 +70,58 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="iamUsername" label="鐧诲綍璐﹀彿" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column label="鎬у埆" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.sex == 1">鐢�</span>
- <span v-if="row.sex == 2">濂�</span>
+ <span v-if="row.sex == 0">鐢�</span>
+ <span v-if="row.sex == 1">濂�</span>
</template>
</el-table-column>
<el-table-column prop="shopName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.status == 0" style="color: green">姝ｅ父</span>
- <span v-if="row.status == 1" style="color: red">绂佺敤</span>
- <span v-if="row.status == 2" style="color: red">鎷夐粦/鍐荤粨</span>
+ <span v-if="row.status == 0" style="color: red">鍋滅敤</span>
+ <span v-if="row.status == 1" style="color:green">鍚敤</span>
</template>
</el-table-column>
- <el-table-column label="閮ㄩ棬绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
- <span v-if="row.companyType == 1">鍐呴儴缁勭粐</span>
- </template>
- </el-table-column>
- <el-table-column label="鍦ㄨ亴鐘舵��">
- <template slot-scope="{row}">
- <el-switch
- @change="changeWorkStatus($event, row)"
- v-model="row.workStatus"
- active-color="#13ce66"
- inactive-color="#ff4949"
- :active-value="0"
- :inactive-value="1">
- </el-switch>
+ <el-table-column prop="shopType" label="缁勭粐绫诲瀷" min-width="80px">
+ <template scope="{row}">
+ <span v-if="row.shopType == 1">HR</span>
+ <span v-if="row.shopType == 2">鍔犵洘鍟�</span>
+ <span v-if="row.shopType == 3">铏氭嫙缁勭粐</span>
+ <span v-if="row.shopSecType == 1">-S</span>
+ <span v-if="row.shopSecType == 2">-F</span>
+ <span v-if="row.shopSecType == 3">-搴楅潰</span>
+ <span v-if="row.shopSecType == 4">-閮ㄩ棬</span>
+ <span v-if="row.shopSecType == 5">-铏氭嫙搴楅潰</span>
</template>
</el-table-column>
<el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
+ <el-table-column prop="roleNames" label="浜哄憳瑙掕壊" min-width="100px"></el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
- <el-table-column fixed="right" label="浜鸿劯淇℃伅" min-width="100px">
+ <el-table-column fixed="right" label="澶村儚" align="center" min-width="100px">
<template slot-scope="{row}">
<el-image
- v-if="row.faceImgFull"
+ v-if="row.imgurlFull"
style="width: 60px; height: 60px"
- :src="row.faceImgFull"
- :preview-src-list="[row.faceImgFull]">
+ :src="row.imgurlFull"
+ :preview-src-list="[row.imgurlFull]">
</el-image>
</template>
</el-table-column>
- <el-table-column
- v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
- label="鎿嶄綔"
- min-width="280"
- fixed="right"
- >
+ <!-- <el-table-column
+ v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
+ label="鎿嶄綔"
+ min-width="280"
+ fixed="right"
+ >
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅',row,department)" v-permissions="['business:empower:update']">缂栬緫</el-button>
- <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:member:delete']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
+ <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅',row,department)" v-permissions="['business:empower:update']">缂栬緫</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:member:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>-->
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -144,7 +140,6 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout1 from '@/layouts/TableLayout1'
import Pagination from '@/components/common/Pagination'
-import Tree from '@/components/common/Tree'
import OperaMemberWindow from '@/components/business/OperaMemberWindow'
import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
import { fetchListByParent } from '@/api/business/shop'
@@ -157,22 +152,15 @@
TreeList: [],
// 鎼滅储
searchForm: {
- name: '',
+ queryKeyword: '',
status: '',
- hkStatus: '',
- includeChild: false,
- canVisit: '',
- keyword: '',
- type: 2,
- companyType: 1,
- erpOrgId: '',
- companyId: '',
- hasFace: ''
+ iamOrgId: '',
+ shopName: '',
+ shopType: null,
+ shopSecType: null,
+ includeChild: false
},
loading: false,
- heading: false,
- working: false,
- canvisiting: false,
companyTree: [],
department: []
}
@@ -184,7 +172,7 @@
'field.id': 'id',
'field.main': 'id'
})
- // this.search()
+ this.search()
// this.loadShopTree()
},
methods: {
@@ -211,8 +199,7 @@
},
callback (row) {
console.log(row)
- this.searchForm.erpOrgId = row.erpId
- this.searchForm.companyId = row.id
+ this.searchForm.iamOrgId = row.orgId
this.search()
}
}
diff --git a/admin/vue.config.js b/admin/vue.config.js
index a39f3b8..f3f181a 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -11,7 +11,7 @@
port: 10012,
proxy: {
[process.env.VUE_APP_API_PREFIX]: {
- target: 'http://localhost:10028',
+ target: process.env.VUE_APP_BASE_API,
changeOrigin: true,
pathRewrite: {
[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
diff --git a/server/admin/admin.iml b/server/admin/admin.iml
index f57ca7b..3f494ce 100644
--- a/server/admin/admin.iml
+++ b/server/admin/admin.iml
@@ -215,6 +215,20 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.5.8" level="project" />
<orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.17" level="project" />
+ <orderEntry type="library" name="Maven: io.github.x-stream:mxparser:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.11" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
<orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.8.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />
<orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
@@ -262,13 +276,6 @@
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.45.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.45.Final" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.6.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.6.0" level="project" />
- <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11" level="project" />
- <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
- <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.11" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
- <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
<orderEntry type="library" name="Maven: com.auth0:java-jwt:3.4.0" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/server/admin/src/main/java/com/doumee/api/business/PushController.java b/server/admin/src/main/java/com/doumee/api/business/PushController.java
index f599904..f7a8013 100644
--- a/server/admin/src/main/java/com/doumee/api/business/PushController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/PushController.java
@@ -43,6 +43,7 @@
success = Constants.ONE;
r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
}catch (Exception e){
+ e.printStackTrace();
success = Constants.ONE;
r = ApiResponse.failed("鎿嶄綔澶辫触");
}finally {
@@ -67,6 +68,7 @@
r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
}catch (Exception e){
success = Constants.ONE;
+ e.getMessage();
r = ApiResponse.failed("鎿嶄綔澶辫触");
}finally {
zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo","IAM鎺ㄩ�佷汉鍛樿处鍙蜂俊鎭�", token, uuid, timestamp, upateUserModel,success, JSONObject.toJSONString(r));
diff --git a/server/admin/target/classes/META-INF/MANIFEST.MF b/server/admin/target/classes/META-INF/MANIFEST.MF
deleted file mode 100644
index 7ff5b00..0000000
--- a/server/admin/target/classes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.doumee.AdminApplication
-
diff --git a/server/admin/target/classes/application.yml b/server/admin/target/classes/application.yml
deleted file mode 100644
index 8e8e46b..0000000
--- a/server/admin/target/classes/application.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-# 椤圭洰淇℃伅閰嶇疆
-project:
- name: 璁垮绯荤粺
- version: 1.0.0
- env: development
-# env: production
-
-
-spring:
- # application:
- # name: doumee
- profiles:
- active: dev
-
- # JSON杩斿洖閰嶇疆
- jackson:
- # 榛樿鏃跺尯
- time-zone: GMT+8
- # 榛樿鏃ユ湡鏍煎紡鍖�
- date-format: yyyy-MM-dd HH:mm:ss
- servlet:
- multipart:
- max-file-size: 200MB
- max-request-size: 200MB
- enabled: true
-# MyBatis閰嶇疆
-mybatis-plus:
- mapper-locations: classpath*:/mappers/**/*.xml
- configuration:
- map-underscore-to-camel-case: true
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-# 缂撳瓨鍐呭璁剧疆
-cache:
- session:
- # 浼氳瘽杩囨湡鏃堕暱(s)
- expire: 18000
- captcha:
- # 楠岃瘉鐮佽繃鏈熸椂闀�(s)
- expire: 300
-
-# 璺熻釜鏃ュ織
-trace:
- # 寮�鍚櫤鑳借窡韪ā寮�
- smart: true
- # 鎺掗櫎璺熻釜鐨刄RL姝ｅ垯
- exclude-patterns: .+/list[a-zA-Z0-9\-\_]*$, .+/tree[a-zA-Z0-9\-\_]*$, .+/page[a-zA-Z0-9\-\_]*$, .+/all[a-zA-Z0-9\-\_]*$, /swagger-resources.*
-
-# 鏃ュ織閰嶇疆
-logback:
- level: INFO
- appender: ${project.env}
-# dao灞傜殑鏃ュ織璁剧疆涓篸ebug锛屾柟渚挎煡鐪媠ql
-logging:
- level:
- com.doumee.dao: debug
-
-knife4j:
- enable: true
- basic:
- enable: true
- username: admin
- password: 111111
-
-# WEB鏈嶅姟鍣ㄩ厤缃�
-server:
- compression:
- enabled: true
- mime-types: application/json
- port: 10028
- tomcat:
- max-swallow-size: -1
- servlet:
- session:
- timeout: PT3H #琛ㄧず12灏忔椂
diff --git a/server/admin/target/classes/com/doumee/AdminApplication.class b/server/admin/target/classes/com/doumee/AdminApplication.class
deleted file mode 100644
index 596a375..0000000
--- a/server/admin/target/classes/com/doumee/AdminApplication.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/BaseController.class b/server/admin/target/classes/com/doumee/api/BaseController.class
deleted file mode 100644
index 8a3f5ee..0000000
--- a/server/admin/target/classes/com/doumee/api/BaseController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/ActionsController.class b/server/admin/target/classes/com/doumee/api/business/ActionsController.class
deleted file mode 100644
index f0c3864..0000000
--- a/server/admin/target/classes/com/doumee/api/business/ActionsController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/BjParamController.class b/server/admin/target/classes/com/doumee/api/business/BjParamController.class
deleted file mode 100644
index 62ea10a..0000000
--- a/server/admin/target/classes/com/doumee/api/business/BjParamController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/CategoryController.class b/server/admin/target/classes/com/doumee/api/business/CategoryController.class
deleted file mode 100644
index 482c483..0000000
--- a/server/admin/target/classes/com/doumee/api/business/CategoryController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/CategorySegController.class b/server/admin/target/classes/com/doumee/api/business/CategorySegController.class
deleted file mode 100644
index 5512a5e..0000000
--- a/server/admin/target/classes/com/doumee/api/business/CategorySegController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/CrmInterfaceLogController.class b/server/admin/target/classes/com/doumee/api/business/CrmInterfaceLogController.class
deleted file mode 100644
index c083665..0000000
--- a/server/admin/target/classes/com/doumee/api/business/CrmInterfaceLogController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/CustomerController.class b/server/admin/target/classes/com/doumee/api/business/CustomerController.class
deleted file mode 100644
index 28c6ae9..0000000
--- a/server/admin/target/classes/com/doumee/api/business/CustomerController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/CustomerLogController.class b/server/admin/target/classes/com/doumee/api/business/CustomerLogController.class
deleted file mode 100644
index 07dc52e..0000000
--- a/server/admin/target/classes/com/doumee/api/business/CustomerLogController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/IamInterfaceLogController.class b/server/admin/target/classes/com/doumee/api/business/IamInterfaceLogController.class
deleted file mode 100644
index 1bacf6c..0000000
--- a/server/admin/target/classes/com/doumee/api/business/IamInterfaceLogController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/InterfaceLogController.class b/server/admin/target/classes/com/doumee/api/business/InterfaceLogController.class
deleted file mode 100644
index 837fb88..0000000
--- a/server/admin/target/classes/com/doumee/api/business/InterfaceLogController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/MemberController.class b/server/admin/target/classes/com/doumee/api/business/MemberController.class
deleted file mode 100644
index 0c4f32c..0000000
--- a/server/admin/target/classes/com/doumee/api/business/MemberController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/MultifileController.class b/server/admin/target/classes/com/doumee/api/business/MultifileController.class
deleted file mode 100644
index acd6cbf..0000000
--- a/server/admin/target/classes/com/doumee/api/business/MultifileController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/NewsController.class b/server/admin/target/classes/com/doumee/api/business/NewsController.class
deleted file mode 100644
index 6dc15cb..0000000
--- a/server/admin/target/classes/com/doumee/api/business/NewsController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/SegmentsController.class b/server/admin/target/classes/com/doumee/api/business/SegmentsController.class
deleted file mode 100644
index 3ba9f86..0000000
--- a/server/admin/target/classes/com/doumee/api/business/SegmentsController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/ShopController.class b/server/admin/target/classes/com/doumee/api/business/ShopController.class
deleted file mode 100644
index 4e5b183..0000000
--- a/server/admin/target/classes/com/doumee/api/business/ShopController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/business/UsersController.class b/server/admin/target/classes/com/doumee/api/business/UsersController.class
deleted file mode 100644
index 958f738..0000000
--- a/server/admin/target/classes/com/doumee/api/business/UsersController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/common/CaptchaController.class b/server/admin/target/classes/com/doumee/api/common/CaptchaController.class
deleted file mode 100644
index d360a30..0000000
--- a/server/admin/target/classes/com/doumee/api/common/CaptchaController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/common/PublicController.class b/server/admin/target/classes/com/doumee/api/common/PublicController.class
deleted file mode 100644
index c93b520..0000000
--- a/server/admin/target/classes/com/doumee/api/common/PublicController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemController.class b/server/admin/target/classes/com/doumee/api/system/SystemController.class
deleted file mode 100644
index 1ce9087..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemDataPermissionController.class b/server/admin/target/classes/com/doumee/api/system/SystemDataPermissionController.class
deleted file mode 100644
index 5c8d58d..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemDataPermissionController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemDepartmentController.class b/server/admin/target/classes/com/doumee/api/system/SystemDepartmentController.class
deleted file mode 100644
index ebf156d..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemDepartmentController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemDictController.class b/server/admin/target/classes/com/doumee/api/system/SystemDictController.class
deleted file mode 100644
index 27a67c8..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemDictController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemDictDataController.class b/server/admin/target/classes/com/doumee/api/system/SystemDictDataController.class
deleted file mode 100644
index 0b42b25..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemDictDataController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemLoginLogController.class b/server/admin/target/classes/com/doumee/api/system/SystemLoginLogController.class
deleted file mode 100644
index d58894d..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemLoginLogController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemMenuController.class b/server/admin/target/classes/com/doumee/api/system/SystemMenuController.class
deleted file mode 100644
index 438ee00..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemMenuController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemMonitorController.class b/server/admin/target/classes/com/doumee/api/system/SystemMonitorController.class
deleted file mode 100644
index a1a4da3..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemMonitorController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemPermissionController.class b/server/admin/target/classes/com/doumee/api/system/SystemPermissionController.class
deleted file mode 100644
index 298a12c..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemPermissionController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemPositionController.class b/server/admin/target/classes/com/doumee/api/system/SystemPositionController.class
deleted file mode 100644
index b1b1704..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemPositionController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemRoleController.class b/server/admin/target/classes/com/doumee/api/system/SystemRoleController.class
deleted file mode 100644
index 4ed8cda..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemRoleController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemTraceLogController.class b/server/admin/target/classes/com/doumee/api/system/SystemTraceLogController.class
deleted file mode 100644
index e069411..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemTraceLogController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/system/SystemUserController.class b/server/admin/target/classes/com/doumee/api/system/SystemUserController.class
deleted file mode 100644
index 84d232c..0000000
--- a/server/admin/target/classes/com/doumee/api/system/SystemUserController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/api/timer/QuartzController.class b/server/admin/target/classes/com/doumee/api/timer/QuartzController.class
deleted file mode 100644
index f47004d..0000000
--- a/server/admin/target/classes/com/doumee/api/timer/QuartzController.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroAuthFilter.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroAuthFilter.class
deleted file mode 100644
index 8ca27a0..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroAuthFilter.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroCache.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroCache.class
deleted file mode 100644
index f5393a9..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroCache.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroCacheManager.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroCacheManager.class
deleted file mode 100644
index 2efa336..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroCacheManager.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroConfig.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroConfig.class
deleted file mode 100644
index f0f0f03..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroCredentialsMatcher.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroCredentialsMatcher.class
deleted file mode 100644
index df5fbe0..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroCredentialsMatcher.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroRealm.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroRealm.class
deleted file mode 100644
index c0e55ef..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroRealm.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroSessionDAO.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroSessionDAO.class
deleted file mode 100644
index 28a3e87..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroSessionDAO.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroSessionManager.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroSessionManager.class
deleted file mode 100644
index bd5f3ad..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroSessionManager.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroSessionSerializer.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroSessionSerializer.class
deleted file mode 100644
index 2ef9735..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroSessionSerializer.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroToken.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroToken.class
deleted file mode 100644
index 25c3b74..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroToken.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/shiro/ShiroTokenManager.class b/server/admin/target/classes/com/doumee/config/shiro/ShiroTokenManager.class
deleted file mode 100644
index 40577a8..0000000
--- a/server/admin/target/classes/com/doumee/config/shiro/ShiroTokenManager.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/swagger/SwaggerConfig.class b/server/admin/target/classes/com/doumee/config/swagger/SwaggerConfig.class
deleted file mode 100644
index ffafb95..0000000
--- a/server/admin/target/classes/com/doumee/config/swagger/SwaggerConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/swagger/SwaggerInterceptor.class b/server/admin/target/classes/com/doumee/config/swagger/SwaggerInterceptor.class
deleted file mode 100644
index 240f1b0..0000000
--- a/server/admin/target/classes/com/doumee/config/swagger/SwaggerInterceptor.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/config/swagger/SwaggerInterceptorConfig.class b/server/admin/target/classes/com/doumee/config/swagger/SwaggerInterceptorConfig.class
deleted file mode 100644
index 6f5592c..0000000
--- a/server/admin/target/classes/com/doumee/config/swagger/SwaggerInterceptorConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/timer/JobService.class b/server/admin/target/classes/com/doumee/timer/JobService.class
deleted file mode 100644
index 5ff0065..0000000
--- a/server/admin/target/classes/com/doumee/timer/JobService.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/timer/ZbomIAMSyncJobBiz.class b/server/admin/target/classes/com/doumee/timer/ZbomIAMSyncJobBiz.class
deleted file mode 100644
index d54140c..0000000
--- a/server/admin/target/classes/com/doumee/timer/ZbomIAMSyncJobBiz.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/com/doumee/timer/init/TimerBizSevice.class b/server/admin/target/classes/com/doumee/timer/init/TimerBizSevice.class
deleted file mode 100644
index 0433995..0000000
--- a/server/admin/target/classes/com/doumee/timer/init/TimerBizSevice.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/logback-spring.xml b/server/admin/target/classes/logback-spring.xml
deleted file mode 100644
index a5f2984..0000000
--- a/server/admin/target/classes/logback-spring.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
- <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <pattern>%highlight(%date{yyyy-MM-dd HH:mm:ss}) | %highlight(%-5level) | %highlight(%thread) | %highlight(%logger) | %msg%n</pattern>
- </layout>
- </appender>
- <property name="log.path" value="/usr/local/jars/log/admin"></property>
- <property name="log.fileSize" value="100MB"></property>
- <property name="log.historyDays" value="7"></property>
-
- <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>ERROR</level>
- <!--鍖归厤灏辫垗鍘�-->
- <onMatch>DENY</onMatch>
- <onMismatch>ACCEPT</onMismatch>
- </filter>
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
- </encoder>
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <!--璺緞-->
- <fileNamePattern>${log.path}/info.%d.%i.log</fileNamePattern>
- <maxFileSize>${log.fileSize}</maxFileSize>
- <maxHistory>${log.historyDays}</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
-
- <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <level>ERROR</level>
- </filter>
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
- </encoder>
- <!--婊氬姩绛栫暐-->
- <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <!--璺緞-->
- <fileNamePattern>${log.path}/error.%d.%i.log</fileNamePattern>
- <maxFileSize>${log.fileSize}</maxFileSize>
- <maxHistory>${log.historyDays}</maxHistory>
- <totalSizeCap>1GB</totalSizeCap>
- </rollingPolicy>
- </appender>
- <!-- 寮傛鍐欏叆鏃ュ織 -->
- <appender name ="ASYNC" class= "ch.qos.logback.classic.AsyncAppender">
- <!-- 涓嶄涪澶辨棩蹇�.榛樿鐨�,濡傛灉闃熷垪鐨�80%宸叉弧,鍒欎細涓㈠純TRACT銆丏EBUG銆両NFO绾у埆鐨勬棩蹇� -->
- <discardingThreshold >0</discardingThreshold>
- <!-- 鏇存敼榛樿鐨勯槦鍒楃殑娣卞害,璇ュ�间細褰卞搷鎬ц兘.榛樿鍊间负256 -->
- <queueSize>512</queueSize>
- <!-- 娣诲姞闄勫姞鐨刟ppender,鏈�澶氬彧鑳芥坊鍔犱竴涓� -->
- <appender-ref ref ="fileInfoLog"/>
- </appender>
- <root level="info">
- <appender-ref ref="consoleLog"/>
- <appender-ref ref="fileInfoLog"/>
- <appender-ref ref="fileErrorLog"/>
- </root>
-</configuration>
\ No newline at end of file
diff --git a/server/admin/target/classes/mapper/QuartzJobMapper.class b/server/admin/target/classes/mapper/QuartzJobMapper.class
deleted file mode 100644
index ad48678..0000000
--- a/server/admin/target/classes/mapper/QuartzJobMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/admin/target/classes/mapper/QuartzLogMapper.class b/server/admin/target/classes/mapper/QuartzLogMapper.class
deleted file mode 100644
index bf528a4..0000000
--- a/server/admin/target/classes/mapper/QuartzLogMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/pom.xml b/server/pom.xml
index 11bccf4..64ea08a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -201,12 +201,12 @@
<artifactId>pinyin4j</artifactId>
<version>2.5.1</version>
</dependency>
-<!-- <!– WeChat 灏忕▼搴� –>-->
-<!-- <dependency>-->
-<!-- <groupId>com.github.binarywang</groupId>-->
-<!-- <artifactId>weixin-java-miniapp</artifactId>-->
-<!-- <version>${weixin-java-miniapp.version}</version>-->
-<!-- </dependency>-->
+ <!-- WeChat 灏忕▼搴� -->
+ <dependency>
+ <groupId>com.github.binarywang</groupId>
+ <artifactId>weixin-java-miniapp</artifactId>
+ <version>${weixin-java-miniapp.version}</version>
+ </dependency>
<!-- <!– WeChat 鏀粯 –>-->
<!-- <dependency>-->
<!-- <groupId>com.github.binarywang</groupId>-->
diff --git a/server/service/service.iml b/server/service/service.iml
index 34c072b..057983d 100644
--- a/server/service/service.iml
+++ b/server/service/service.iml
@@ -214,6 +214,20 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.5.8" level="project" />
<orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.17" level="project" />
+ <orderEntry type="library" name="Maven: io.github.x-stream:mxparser:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.11" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
<orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.8.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />
<orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
@@ -261,13 +275,6 @@
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.45.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.45.Final" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.6.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.6.0" level="project" />
- <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11" level="project" />
- <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
- <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.11" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
- <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
<orderEntry type="library" name="Maven: com.auth0:java-jwt:3.4.0" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index 3ae82f8..0e7c910 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -33,11 +33,11 @@
public Integer create(SystemDictData systemDictData) {
SystemDictData queryDto = new SystemDictData();
queryDto.setDictId(systemDictData.getDictId());
- queryDto.setCode(systemDictData.getCode());
+ queryDto.setLabel(systemDictData.getLabel());
queryDto.setDeleted(Boolean.FALSE);
SystemDictData dictData = systemDictDataService.findOne(queryDto);
if (dictData != null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鍊煎凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鏍囩宸插瓨鍦�");
}
return systemDictDataService.create(systemDictData);
}
@@ -46,11 +46,11 @@
public void updateById(SystemDictData systemDictData) {
SystemDictData queryDto = new SystemDictData();
queryDto.setDictId(systemDictData.getDictId());
- queryDto.setCode(systemDictData.getLabel());
+ queryDto.setLabel(systemDictData.getLabel());
queryDto.setDeleted(Boolean.FALSE);
SystemDictData dictData = systemDictDataService.findOne(queryDto);
if (dictData != null && !dictData.getId().equals(systemDictData.getId())) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鍊煎凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鏁版嵁鏍囩宸插瓨鍦�");
}
systemDictDataService.updateById(systemDictData);
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java
new file mode 100644
index 0000000..e78f898
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java
@@ -0,0 +1,19 @@
+package com.doumee.biz.zbom;
+
+import com.doumee.biz.zbom.model.CrmCustomerSubmmitModel;
+import com.doumee.biz.zbom.model.IamUpateShopModel;
+import com.doumee.biz.zbom.model.IamUpateUserModel;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 蹇楅偊CRM瀵规帴涓氬姟鎺ュ彛
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Service
+public interface ZbomCRMService {
+
+ int postDataToCrm(CrmCustomerSubmmitModel entity );
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java
index 67b62b6..59c90e8 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomIAMService.java
@@ -9,7 +9,7 @@
import java.util.List;
/**
- * 浜哄憳淇℃伅琛⊿ervice瀹炵幇
+ * 蹇楅偊IAM瀵规帴涓氬姟鎺ュ彛
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
*/
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomSMSService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomSMSService.java
new file mode 100644
index 0000000..906ae4e
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomSMSService.java
@@ -0,0 +1,14 @@
+package com.doumee.biz.zbom;
+
+import com.doumee.biz.zbom.model.CrmCustomerSubmmitModel;
+import org.springframework.stereotype.Service;
+
+/**
+ * 蹇楅偊鐭俊閫氶亾瀵规帴涓氬姟鎺ュ彛
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Service
+public interface ZbomSMSService {
+ boolean sendMessage(String content,String phone) ;
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
index eb02b13..49eabf5 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
@@ -5,7 +5,7 @@
import org.springframework.stereotype.Service;
/**
- * 浜哄憳淇℃伅琛⊿ervice瀹炵幇
+ * 蹇楅偊涓彴瀵规帴涓氬姟鎺ュ彛
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
*/
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java
new file mode 100644
index 0000000..917c171
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java
@@ -0,0 +1,119 @@
+package com.doumee.biz.zbom.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.doumee.biz.zbom.ZbomCRMService;
+import com.doumee.biz.zbom.model.CrmCustomerInfoModel;
+import com.doumee.biz.zbom.model.CrmCustomerSubmmitModel;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.HttpsUtil;
+import com.doumee.dao.business.CrmInterfaceLogMapper;
+import com.doumee.dao.business.CustomerLogMapper;
+import com.doumee.dao.business.model.CrmInterfaceLog;
+import com.doumee.dao.business.model.CustomerLog;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * 蹇楅偊CRM瀹㈡埛淇℃伅鎻愪氦鎺ュ彛
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Service
+public class ZbomCRMServiceImpl implements ZbomCRMService {
+
+ @Autowired
+ private CustomerLogMapper customerLogMapper;
+ @Autowired
+ private CrmInterfaceLogMapper crmInterfaceLogMapper;
+
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+ /**
+ * 蹇楅偊瀹㈡埛淇℃伅鎻愪氦鎺ュ彛
+ * @param entity
+ * @return
+ */
+ @Override
+ public int postDataToCrm(CrmCustomerSubmmitModel entity ) {
+ // TODO Auto-generated method stub
+ int status = 2;
+ if(entity==null || entity.getCusInfo()==null || entity.getCusInfo().size() ==0){
+ return status;
+ }
+ String type = "postCusData";
+ String appid = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_CRM_API_KEY);
+ String urlStr = (String)redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_CRM_API_URL) ;
+
+ long _t = System.currentTimeMillis();
+ String crmInfo="鎻愪氦澶辫触";
+ if (StringUtils.isNotBlank(appid)||StringUtils.isNotBlank(urlStr)) {
+ String token = DigestUtils.md5Hex(type + _t + appid);
+ String url = urlStr + "?type=" + type + "&_t=" + _t + "&token=" + token;// 鎻愪氦CRM鍦板潃
+ String param = JSONObject.toJSONString(entity);
+ int success =1;
+ String result = null;
+ try {
+ result = HttpsUtil.postJson(url,param);
+ if (StringUtils.isNotBlank(result)) {
+ JSONObject r = JSONObject.parseObject(result.replace("(", "").replace(")", ""));
+ if (r != null && (StringUtils.equalsIgnoreCase(r.getString("code"), "1")
+ || StringUtils.equalsIgnoreCase(r.getString("code"), "2"))) {
+ status = 1;
+ crmInfo="鎻愪氦鎴愬姛";
+ success =0;
+ }else{
+ status = 2;
+ crmInfo="鎻愪氦澶辫触["+ result+"]";
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ crmInfo+= e.getMessage();
+ }finally {
+ saveInterfaceLog(url,"蹇楅偊CRM瀹㈡埛鐣欒祫淇℃伅鎻愪氦",param,success,result);
+ }
+ }else{
+ status = 2;
+ crmInfo="鎻愪氦澶辫触crm閰嶇疆鏈夎锛宎ppid:["+ appid+"]"+"url:["+ urlStr+"]";
+ }
+ List<Long> idList = new ArrayList<>();
+ for(CrmCustomerInfoModel info : entity.getCusInfo()){
+ idList.add(info.getId());
+ }
+ // 濡傛灉鎻愪氦鎴愬姛
+ CustomerLog d = new CustomerLog();
+ d.setId(entity.getCusInfo().get(0).getId());
+ d.setCrmStatus(Constants.ONE);
+ customerLogMapper.update(null,new UpdateWrapper<CustomerLog>().lambda()
+ .in(CustomerLog::getId,idList)
+ .set(CustomerLog::getCrmStatus,Constants.ONE )
+ .set(CustomerLog::getCrmInfo,crmInfo )
+ .set(CustomerLog::getCrmDate,new Date() ));// 鏇存柊鐘舵��
+ return status;// 榛樿澶辫触
+ }
+ public void saveInterfaceLog(String url,String name,String param,Integer success,String respone){
+ if(crmInterfaceLogMapper ==null){
+ return;
+ }
+ CrmInterfaceLog log = new CrmInterfaceLog();
+ log.setCreateDate(new Date());
+ log.setUrl(url);
+ log.setEditDate(log.getCreateDate());
+ log.setPlat(Constants.ZERO);
+ log.setName(name);
+ log.setIsdeleted(Constants.ZERO);
+ log.setRequest(param);
+ log.setType(Constants.ONE);
+ log.setSuccess(success);
+ log.setRepose(respone);
+ crmInterfaceLogMapper.insert(log);
+ }
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
index b89d3dc..4542b02 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomIAMServiceImpl.java
@@ -15,6 +15,7 @@
import com.doumee.dao.business.model.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -43,6 +44,12 @@
private IamInterfaceLogMapper iamInterfaceLogMapper;
@Autowired
private SegmentsMapper segmentsMapper;
+ /**
+ * 鏄惁寮�鍙戣��
+ */
+ @Value("${debug_model}")
+ private Boolean isDebug;
+
/**
* 鍒濆鍖栧悓姝ョ敤鎴�
@@ -76,10 +83,12 @@
.eq(Shop::getOrgId,model.getIdtOrgId())
.last("limit 1"));
if(shop == null){
+ shop = new Shop();
+ shop.setCreateDate(date);
addShops.add(initShopInfo(shop,model,date));
}else {
segDelOrgIds.add(shop.getOrgId());
- updateShops.add(shop);
+ updateShops.add(initShopInfo(shop,model,date));
}
//澶勭悊鍝佺被鏁版嵁閫昏緫
dealCategorySegData(date,shop,model.getCategory(),categorySegList,segmentsList);
@@ -207,15 +216,13 @@
}
private Shop initShopInfo(Shop shop, IamUpateShopModel model, Date date) {
- if(shop == null) {
- shop = new Shop();
- shop.setCreateDate(date);
- }
shop.setEditDate(date);
shop.setOrgId(model.getIdtOrgId());
shop.setName(model.getIdtOrgName());
shop.setCode(model.getIdtOrgCode());
shop.setType(model.getIdtOrgFirstLevelType());
+
+ shop.setStatus(Constants.parseIntByStr(model.getIdtOrgStatus()));
shop.setSecondType(model.getIdtOrgSecondLevelType());
shop.setAttribute(model.getIdtOrgAttribute());
if(model.getScode()!=null){
@@ -261,6 +268,9 @@
}
private void isValidToken(String uuid, String timestamp, String token) {
+ if(isDebug){
+ return;
+ }
if (!StringUtils.equalsIgnoreCase( getToken( uuid, timestamp), token)) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝token閿欒~");
}
@@ -294,6 +304,7 @@
users.setEditDate(new Date());
users.setSex(upateUserModel.getIdtUserGender());
users.setIamUsername(upateUserModel.getAppAccountNo());
+ users.setCode(upateUserModel.getIdtUserWorkNo());
users.setName(upateUserModel.getIdtUserName());
users.setPassword(upateUserModel.getAppAccountPwd());
users.setPhone(upateUserModel.getIdtUserMobile());
@@ -301,24 +312,27 @@
users.setStatus(upateUserModel.getAppAccountStatus());
users.setIsdeleted(Constants.ZERO);
users.setRemark(JSONObject.toJSONString(upateUserModel));
+ users.setRoleNames(null);
+ users.setRoleIds(null);
+ users.setUserTypes(null);
if( upateUserModel.getUserTypes() !=null){
for(IamUserTypeModel type : upateUserModel.getUserTypes()){
- if(StringUtils.isNotBlank(users.getUserTypes())){
+ if(StringUtils.isBlank(users.getUserTypes())){
users.setUserTypes("");
}
- users.setUserTypes("["+users.getUserTypes()+type.getIdtUserTypeCode()+"];");
+ users.setUserTypes(users.getUserTypes()+"["+type.getIdtUserTypeCode()+"];");
}
}
if( upateUserModel.getRoles() !=null){
for(IamUserRoleModel t : upateUserModel.getRoles()){
- if(StringUtils.isNotBlank(users.getRoleIds())){
+ if(StringUtils.isBlank(users.getRoleIds())){
users.setRoleIds("");
}
- if(StringUtils.isNotBlank(users.getRoleNames())){
+ if(StringUtils.isBlank(users.getRoleNames())){
users.setRoleNames("");
}
- users.setRoleIds("["+users.getRoleIds()+t.getId()+"];");
- users.setRoleNames("["+users.getRoleNames()+t.getName()+"];");
+ users.setRoleIds(users.getRoleIds()+t.getId()+"["+t.getId()+"];");
+ users.setRoleNames(users.getRoleNames()+"["+t.getName()+"];");
}
}
if(upateUserModel.getJobs()!=null){
@@ -334,7 +348,7 @@
Shop shop = shopMapper.selectOne(new QueryWrapper<Shop>().lambda()
.eq(Shop::getOrgId,orgId)
.last("limit 1"));
- users.setDepartmentId(shop.getId());
+ users.setDepartmentId(shop ==null?null:shop.getId());
}
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomSMSServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomSMSServiceImpl.java
new file mode 100644
index 0000000..dc37011
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomSMSServiceImpl.java
@@ -0,0 +1,114 @@
+package com.doumee.biz.zbom.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.doumee.biz.zbom.ZbomCRMService;
+import com.doumee.biz.zbom.ZbomSMSService;
+import com.doumee.biz.zbom.model.CrmCustomerInfoModel;
+import com.doumee.biz.zbom.model.CrmCustomerSubmmitModel;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.HttpsUtil;
+import com.doumee.dao.business.CrmInterfaceLogMapper;
+import com.doumee.dao.business.CustomerLogMapper;
+import com.doumee.dao.business.model.CrmInterfaceLog;
+import com.doumee.dao.business.model.CustomerLog;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 蹇楅偊CRM瀹㈡埛淇℃伅鎻愪氦鎺ュ彛
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Service
+public class ZbomSMSServiceImpl implements ZbomSMSService {
+
+ @Autowired
+ private CustomerLogMapper customerLogMapper;
+ @Autowired
+ private CrmInterfaceLogMapper crmInterfaceLogMapper;
+
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
+ public static void main(String[] args) {
+ ZbomSMSServiceImpl obj = new ZbomSMSServiceImpl();
+ obj.sendMessage("鎮ㄧ殑楠岃瘉鐮佹槸765412锛屾楠岃瘉鐮佺敤浜庨噸缃瘑鐮併��3鍒嗛挓鍐呮湁鏁堛��","15345690849");
+ }
+ /**
+ * 蹇楅偊瀹㈡埛淇℃伅鎻愪氦鎺ュ彛
+ * @return
+ */
+ @Override
+ public boolean sendMessage(String content,String phone) {
+ // TODO Auto-generated method stub
+ if(StringUtils.isBlank(content)){
+ return false;
+ }
+ String appkey = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_SMS_API_KEY);
+ String urlStr = (String)redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_SMS_API_URL) ;
+ try {
+ StringBuffer sb = new StringBuffer(urlStr);
+ Integer _t = (int) System.currentTimeMillis();
+ // 鍚慡tringBuffer杩藉姞鐢ㄦ埛鍚�
+ sb.append("_t=" + _t);
+ sb.append("&smsphone=" + phone);
+ sb.append("&smscode=10005");
+ // 鍚慡tringBuffer杩藉姞瀵嗙爜锛堢櫥闄嗙綉椤电増锛屽湪绠＄悊涓績--鍩烘湰璧勬枡--鎺ュ彛瀵嗙爜锛屾槸28浣嶇殑锛�
+ sb.append("&smsmsg=" + URLEncoder.encode(content.replace(" ", ""), "UTF-8"));
+ // 鍔犲瘑
+ // 497fbc01e744ef44001296b7466148e8
+ sb.append("&token=" + DigestUtils.md5Hex(phone + _t + appkey));
+
+ // 鍒涘缓url瀵硅薄
+ URL url = new URL(sb.toString());
+ // 鎵撳紑url杩炴帴
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+
+ // 璁剧疆url璇锋眰鏂瑰紡 鈥榞et鈥� 鎴栬�� 鈥榩ost鈥�
+ connection.setRequestMethod("POST");
+ connection.setConnectTimeout(500);
+ connection.setReadTimeout(500);
+ // 鍙戦��
+ BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()));
+ // 杩斿洖鍙戦�佺粨鏋�
+ String inputline = in.readLine();
+ // 杩斿洖缁撴灉涓衡��0锛�20140009090990,1锛屾彁浜ゆ垚鍔熲�� 鍙戦�佹垚鍔� 鍏蜂綋瑙佽鏄庢枃妗�
+ System.out.println(inputline);
+ saveInterfaceLog(urlStr,"蹇楅偊鐭俊鍙戦�佹帴鍙�", sb.toString(), 0,inputline);
+ return true;//
+ }catch (Exception e){
+ return false;
+ }
+
+ }
+ public void saveInterfaceLog(String url,String name,String param,Integer success,String respone){
+ if(crmInterfaceLogMapper ==null){
+ return;
+ }
+ CrmInterfaceLog log = new CrmInterfaceLog();
+ log.setCreateDate(new Date());
+ log.setUrl(url);
+ log.setEditDate(log.getCreateDate());
+ log.setPlat(Constants.ZERO);
+ log.setName(name);
+ log.setIsdeleted(Constants.ZERO);
+ log.setRequest(param);
+ log.setType(Constants.ONE);
+ log.setSuccess(success);
+ log.setRepose(respone);
+ crmInterfaceLogMapper.insert(log);
+ }
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/CrmCustomerInfoModel.java b/server/service/src/main/java/com/doumee/biz/zbom/model/CrmCustomerInfoModel.java
new file mode 100644
index 0000000..956be0c
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/CrmCustomerInfoModel.java
@@ -0,0 +1,42 @@
+package com.doumee.biz.zbom.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel("蹇楅偊CRM瀹㈡埛鐣欒祫鎻愪氦鏄庣粏鍙傛暟")
+public class CrmCustomerInfoModel implements Serializable {
+ @ApiModelProperty(value = "浜哄憳缂栫爜")
+ private Long id;
+ @ApiModelProperty(value = "濮撳悕")
+ private String name;
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String phone;
+ @ApiModelProperty(value = "璁捐甯堟墜鏈哄彿")
+ private String shopper;
+ @ApiModelProperty(value = "鏉ユ簮")
+ private String source;
+ @ApiModelProperty(value = "娓犻亾")
+ private String channel;
+ @ApiModelProperty(value = "鏃ユ湡 yyyy/MM/dd HH:mm")
+ private String date;
+ @ApiModelProperty(value = "鎺ㄨ崘浜烘墜鏈哄彿")
+ private String recphone;
+ @ApiModelProperty(value = "鎺ㄨ崘浜哄鍚�")
+ private String recname;
+ @ApiModelProperty(value = "鍘垮尯鍚嶇О")
+ private String areaname;
+ @ApiModelProperty(value = "鍘垮尯缂栫爜")
+ private String areacode;
+ @ApiModelProperty(value = "绯荤粺鐗堟湰鍙�")
+ private String sysversion;
+ @ApiModelProperty(value = "娴忚鍣ㄤ俊鎭�")
+ private String browser;
+ @ApiModelProperty(value = "灏忕▼搴弌penid")
+ private String openid;
+ @ApiModelProperty(value = "缁堢淇℃伅")
+ private String terminal;
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/CrmCustomerSubmmitModel.java b/server/service/src/main/java/com/doumee/biz/zbom/model/CrmCustomerSubmmitModel.java
new file mode 100644
index 0000000..b2af4d4
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/CrmCustomerSubmmitModel.java
@@ -0,0 +1,19 @@
+package com.doumee.biz.zbom.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel("蹇楅偊CRM瀹㈡埛鐣欒祫鎻愪氦鍙傛暟")
+public class CrmCustomerSubmmitModel implements Serializable {
+ @ApiModelProperty(value = "瀹㈡埛淇℃伅")
+ @JsonProperty("cus_info")
+ @SerializedName("cus_info")
+ private List<CrmCustomerInfoModel> cusInfo;
+}
diff --git a/server/service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java b/server/service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java
index 43dc056..443358b 100644
--- a/server/service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java
+++ b/server/service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java
@@ -18,15 +18,21 @@
/**
* 鐢ㄦ埛id
*/
- private String memberId;
+ private long userId;
+ private Integer userType;
private long expire;
public JwtPayLoad() {
}
- public JwtPayLoad(String memberId) {
- this.memberId = memberId;
+ /**
+ * @param userId
+ * @param userType 0=娑堣垂鑰� Member 1=鍐呴儴鍛樺伐
+ */
+ public JwtPayLoad(long userId,Integer userType) {
+ this.userId = userId;
+ this.userType = userType;
}
/**
@@ -37,7 +43,8 @@
*/
public Map<String, Object> toMap() {
HashMap<String, Object> map = new HashMap<>();
- map.put("memberId", this.memberId);
+ map.put("userId", this.userId);
+ map.put("userType", this.userType);
return map;
}
@@ -52,8 +59,8 @@
return new JwtPayLoad();
} else {
JwtPayLoad jwtPayLoad = new JwtPayLoad();
- jwtPayLoad.setMemberId((String) map.get("memberId"));
-
+ jwtPayLoad.setUserId(Long.valueOf(map.get("userId").toString()) );
+ jwtPayLoad.setUserType((Integer) map.get("userType"));
return jwtPayLoad;
}
}
diff --git a/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java b/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
index abf47d7..e427737 100644
--- a/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
+++ b/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
@@ -16,11 +16,17 @@
package com.doumee.config.Jwt;
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Member;
import io.jsonwebtoken.*;
import org.apache.commons.lang3.StringUtils;
+import javax.annotation.Resource;
import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* <p>鍚庡彴绯荤粺jwt token宸ュ叿绫�</p>
@@ -43,8 +49,6 @@
public static final String HEADER_KEY = "token";
//鍙栧�煎悕绉�
public static final String UserId_Name = "AppUserId";
- //鍙栧�煎悕绉�
- public static final String MEMBER = "MEMBER";
//鍔犲瘑瀵嗛挜
private final static String jwtSecret = "MhAjU9poLf8ko54K25XBDtonaL33vtt1";
//杩囨湡鏃堕棿(s) 86400L=1澶� 604800L=7澶�
@@ -56,7 +60,7 @@
public static String generateToken(JwtPayLoad jwtPayLoad) {
Long expiredSeconds = getExpireSeconds();
final Date expirationDate = new Date(System.currentTimeMillis() + expiredSeconds * 1000);
- return generateToken(jwtPayLoad.getMemberId(), expirationDate, jwtPayLoad.toMap());
+ return generateToken(jwtPayLoad.getUserId(), expirationDate, jwtPayLoad.toMap());
}
/**
@@ -77,7 +81,7 @@
public static String generateTokenOld(JwtPayLoad jwtPayLoad) {
Long expiredSeconds = getExpireSeconds();
final Date expirationDate = new Date(System.currentTimeMillis() + expiredSeconds * 1000);
- return generateToken(jwtPayLoad.getMemberId(), expirationDate, jwtPayLoad.toMap());
+ return generateToken(jwtPayLoad.getUserId(), expirationDate, jwtPayLoad.toMap());
}
/**
@@ -128,7 +132,7 @@
/**
* 鐢熸垚token,鏍规嵁userId鍜岃繃鏈熸椂闂�
*/
- public static String generateToken(String userId, Date exppiredDate, Map<String, Object> claims) {
+ public static String generateToken(Long userId, Date exppiredDate, Map<String, Object> claims) {
final Date createdDate = new Date();
String secret = getJwtSecret();
@@ -151,6 +155,8 @@
}
}
+
+
/**
* 鑾峰彇jwt鐨刾ayload閮ㄥ垎
*/
diff --git a/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java b/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
index c827e52..a5b106c 100644
--- a/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
+++ b/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
@@ -1,17 +1,18 @@
package com.doumee.config.Jwt;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.config.annotation.ErpLoginRequired;
+import com.doumee.config.annotation.UserLoginRequired;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.Users;
import io.jsonwebtoken.JwtException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.RedisTemplate;
@@ -25,7 +26,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.Method;
import java.util.Objects;
@Configuration
@@ -60,7 +60,7 @@
// Method method = handlerMethod.getMethod();
- // 鏈� @LoginRequired 娉ㄨВ锛岄渶瑕佺櫥褰曡璇�
+ // 鏈� @LoginRequired 娉ㄨВ锛岄渶瑕佺櫥褰曡璇� 瀹㈡埛绔娇鐢�
if (beanType.isAnnotationPresent(LoginRequired.class) || handlerMethod.hasMethodAnnotation(LoginRequired.class)) {
//鑾峰彇token
String token = request.getHeader(JwtTokenUtil.HEADER_KEY); // 浠� http 璇锋眰澶翠腑鍙栧嚭 token
@@ -69,26 +69,21 @@
} else {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
- } else if(beanType.isAnnotationPresent(ErpLoginRequired.class) || handlerMethod.hasMethodAnnotation(ErpLoginRequired.class)){
- try {
+ // 鏈� @UserLoginRequired 娉ㄨВ锛岄渶瑕佺櫥褰曡璇� 鍐呴儴浜哄憳浣跨敤
+ } else if(beanType.isAnnotationPresent(UserLoginRequired.class) || handlerMethod.hasMethodAnnotation(UserLoginRequired.class)){
//ERP 涓氬姟娉ㄨВ
String token = request.getHeader(JwtTokenUtil.HEADER_KEY);
- String redisToken = RedisUtil.getObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,String.class);
- if(StringUtils.isBlank(redisToken)||!token.equals(redisToken)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎺堟潈宸插け鏁�");
+ if (StringUtils.isNotBlank(token)) {
+ checkPersonnelLogin(request,response);
+ } else {
+ throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
- request.setAttribute(JwtTokenUtil.HEADER_KEY,token);
- } catch (IllegalArgumentException | JwtException e) {
- throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鎺堟潈宸插け鏁�");
- }
-// request.setAttribute("token", token);
}
return true;
}
};
- registry.addInterceptor(TokenInterceptor).addPathPatterns("/web/**","/visitbiz/**");
+ registry.addInterceptor(TokenInterceptor).addPathPatterns("/web/**");
}
-
public Boolean checkLogin(HttpServletRequest request, HttpServletResponse response){
@@ -100,19 +95,53 @@
throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
}
//鑾峰彇璐﹀彿ID
- String memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
+ Long memberId = JwtTokenUtil.getJwtPayLoad(token).getUserId();
+ Integer userType = JwtTokenUtil.getJwtPayLoad(token).getUserType();
+ if(!Constants.equalsInteger(userType,Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃犺闂潈闄�");
+ }
Member member = dao.queryForObject(" select * from `member` where id = ? limit 1 ", new BeanPropertyRowMapper<>(Member.class),memberId );
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(member.getIsdeleted()== Constants.ONE){
+ if(Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
- if(member.getStatus() != Constants.ZERO){
+ if(!Constants.equalsInteger(member.getStatus(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
- request.setAttribute(JwtTokenUtil.MEMBER, member);
+ return true;
+ } catch (IllegalArgumentException | JwtException e) {
+ throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
+ }
+ }
+
+ public Boolean checkPersonnelLogin(HttpServletRequest request, HttpServletResponse response){
+ String token = request.getHeader(JwtTokenUtil.HEADER_KEY);
+ try {
+ //鍒ゆ柇Token鏄惁瓒呮椂
+ boolean expiration = JwtTokenUtil.isTokenExpired(token);
+ if (expiration) {
+ throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"闀挎椂闂存湭鎿嶄綔,璇烽噸鏂扮櫥褰�");
+ }
+ //鑾峰彇璐﹀彿ID
+ Long userId = JwtTokenUtil.getJwtPayLoad(token).getUserId();
+ Integer userType = JwtTokenUtil.getJwtPayLoad(token).getUserType();
+ if(!Constants.equalsInteger(userType,Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏃犺闂潈闄�");
+ }
+ Users users = dao.queryForObject(" select * from `users` where id = ? limit 1 ", new BeanPropertyRowMapper<>(Users.class),userId);
+ if(Objects.isNull(users)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Constants.equalsInteger(users.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ }
+ if(!StringUtils.equals(users.getStatus(),Constants.ZERO+"")){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ }
+ request.setAttribute(JwtTokenUtil.UserId_Name, userId);
return true;
} catch (IllegalArgumentException | JwtException e) {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
diff --git a/server/service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java b/server/service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java
deleted file mode 100644
index 971a6ff..0000000
--- a/server/service/src/main/java/com/doumee/config/annotation/ErpLoginRequired.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.doumee.config.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD,ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ErpLoginRequired {}
diff --git a/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java b/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java
new file mode 100644
index 0000000..4319326
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/config/annotation/UserLoginRequired.java
@@ -0,0 +1,10 @@
+package com.doumee.config.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD,ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UserLoginRequired {}
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index a1b0928..5525149 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
@@ -15,6 +16,10 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.Date;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -32,6 +37,7 @@
public static final String HK_PUSH_URL = "HK_PUSH_URL";
public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ;
+ public static final String REDIS_TOKEN_KEY = "token_";
//琚嫓璁夸汉淇℃伅鏍￠獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID";
@@ -73,11 +79,6 @@
public static final String FTP_USERNAME ="FTP_USERNAME" ;
public static final String FTP_PWD ="FTP_PWD" ;
public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
- public static final String ERP_ORGLIST_URL ="ERP_ORGLIST_URL" ;
- public static final String ERP_USERLIST_URL ="ERP_USERLIST_URL" ;
- public static final String ERP_APPROVE_URL ="ERP_APPROVE_URL" ;
- public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ;
- public static final String ERP ="ERP" ;
public static final Integer THREE =3 ;
public static final Integer FOUR =4 ;
public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
@@ -87,34 +88,80 @@
public static final String ZBOM = "ZBOM" ;
public static final String ZBOM_IAM_APPKEY = "ZBOM_IAM_APPKEY";
public static final String ZBOM_IAM_APPID = "ZBOM_IAM_APPID";
- public static boolean DEALING_HK_SYNCPRIVILEGE= false;
- public static boolean DEALING_HK_SYNCDEVICE = false;
- public static boolean DEALING_HK_SYNCDEVICE_STATUS = false;
- public static boolean DEALING_HK_SYNCPARK = false;
- public static boolean DEALING_HK_IMG = false;
- public static boolean DEALING_HK_ORG = false;
- public static boolean DEALING_HK_USER = false;
- public static boolean DEALING_HK_DEL_USER = false;
- public static boolean DEALING_HK_VISIT = false;
- public static boolean DEALING_HK_VISIT_EXPIRE = false;
- public static boolean DEALING_FROM_HK_VISIT = false;
- public static boolean DEALING_HK_EMPOWER = false;
- public static boolean DEALING_HK_EMPOWER_DETAIL = false;
- public static boolean DEALING_HK_EMPOWER_RESULT = false;
- public static boolean DEALING_HK_PARKBOOK = false;
- // ERP鎺ュ彛閰嶇疆
- public static final String ERP_CONFIG = "ERP_CONFIG";
- // ERP ACCESS_KEY
- public static final String ERP_ACCESS_KEY = "ERP_ACCESS_KEY";
- // ERP ACCESS_SECRET
- public static final String ERP_ACCESS_SECRET = "ERP_ACCESS_SECRET";
- // 鍐呴儴浜哄憳鍐荤粨閰嶇疆鏃堕棿
- public static final String TIMEOUT_FREEZE = "TIMEOUT_FREEZE";
+ public static Integer parseIntByStr(String idtOrgStatus) {
+ try {
+ return Integer.parseInt(idtOrgStatus);
+ }catch (Exception e){
+ return null;
+ }
+ }
- // 瓒呮椂棰勮閰嶇疆
- public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING";
- // FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
+ /**
+ * 闄勪欢瀵硅薄绫诲瀷 0news澶氬浘 1news瑙嗛
+ */
+ public enum MultiFile{
+ NEWS_FILE(0, "鎺ㄥ箍璧勮闄勪欢", "NEWS")
+
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private int key;
+ private String info;// 鎻忚堪
+
+ // 鏋勯�犳柟娉�
+ MultiFile(int key, String name, String info) {
+ this.name = name;
+ this.key = key;
+ this.info = info;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (MultiFile c : MultiFile.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getInfo(int index) {
+ for (MultiFile c : MultiFile.values()) {
+ if (c.getKey() == index) {
+ return c.info;
+ }
+ }
+ return null;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ }
public static Date getBirthdyByCardNo(String idCard){
if(idCard ==null || idCard.length()<14){
@@ -257,9 +304,12 @@
public static final String ACCESS_KEY = "ACCESS_KEY";
public static final String ENDPOINT = "ENDPOINT";
public static final String RESOURCE_PATH = "RESOURCE_PATH";
+ public static final String USERS_FILE = "USERS_FILE";
+ public static final String NEWS_FILE = "NEWS_FILE";
//鍙戦�佷細璁紑濮� 瀹氭椂鎻愬墠澶氬皯鍒嗛挓鍙戦��
public static final String SYSTEM ="SYSTEM";
+ public static final String MEMBER ="MEMBER";
public static final String COFFEE_BEAN_TASK ="COFFEE_BEAN_TASK";
@@ -274,10 +324,19 @@
public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
public static final String WX_PLATFORM_SECRET = "WX_PLATFORM_SECRET";
public static final String WX_PLATFORM_AUDIT_VISIT = "WX_PLATFORM_AUDIT_VISIT";
+ public static final String ZBOM_CRM_API_URL = "ZBOM_CRM_API_URL";
+ public static final String ZBOM_CRM_API_KEY = "ZBOM_CRM_API_KEY";
+ public static final String ZBOM_SMS_API_KEY = "ZBOM_SMS_API_KEY";
+ public static final String ZBOM_SMS_API_URL = "ZBOM_SMS_API_URL";
public static final String WX_PLATFORM_PREFIX = "WX_PLATFORM_PREFIX";
+ public static final String WX_MINI_CONFIG = "WX_MINI_CONFIG";
+ public static final String WX_APPID_CUSTOMER = "WX_APPID_CUSTOMER";
+ public static final String WX_SECRET_CUSTOMER = "WX_SECRET_CUSTOMER";
+ public static final String WX_APPID_PERSONNEL = "WX_APPID_PERSONNEL";
+ public static final String WX_SECRET_PERSONNEL = "WX_SECRET_PERSONNEL";
@@ -285,6 +344,10 @@
public static final String IMPORTING_MEMBER ="IMPORTING_MEMBER";
public static final String IMPORTING_SHOP ="IMPORTING_SHOP";
public static final String IAM_APPID ="IAM_APPID";
+ public static final String ZBOM_CRM_API_KEY ="ZBOM_CRM_API_KEY";
+ public static final String ZBOM_CRM_API_URL ="ZBOM_CRM_API_URL";
+ public static final String ZBOM_SMS_API_KEY ="ZBOM_SMS_API_KEY";
+ public static final String ZBOM_SMS_API_URL ="ZBOM_SMS_API_URL";
public static final String IAM_APPKEY ="IAM_APPKEY";
public static final String SHOP_TREE ="SHOP_TREE";
public static final String ERP_TOKEN ="ERP_TOKEN";
@@ -327,6 +390,12 @@
}
+ public static boolean equalsLong(Long a, Long b) {
+ if (a == null || b==null) {
+ return false;
+ }
+ return a.equals(b);
+ }
public static boolean equalsInteger(Integer a, Integer b) {
if (formatIntegerNum(a) == formatIntegerNum(b)) {
return true;
@@ -461,7 +530,7 @@
list.add(m);
}
System.out.println(JSONObject.toJSONString(list));
-
+
}
@@ -534,4 +603,15 @@
return reqJson;
}
+ public static String getRandom6Num( ) {
+ Random random = new Random();
+ StringBuilder sb = new StringBuilder();
+
+ for (int i = 0; i < 6; i++) {
+ int digit = random.nextInt(10);
+ sb.append(digit);
+ }
+
+ return sb.toString();
+ }
}
diff --git a/server/service/src/main/java/com/doumee/core/utils/QrCodeUtils.java b/server/service/src/main/java/com/doumee/core/utils/QrCodeUtils.java
index 671a4ac..c30fc73 100644
--- a/server/service/src/main/java/com/doumee/core/utils/QrCodeUtils.java
+++ b/server/service/src/main/java/com/doumee/core/utils/QrCodeUtils.java
@@ -1,8 +1,9 @@
package com.doumee.core.utils;
-import com.google.zxing.*;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.HybridBinarizer;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import javax.imageio.ImageIO;
diff --git a/server/service/src/main/java/com/doumee/core/utils/tyyun/TyyZosUtil.java b/server/service/src/main/java/com/doumee/core/utils/tyyun/TyyZosUtil.java
index 2a270f4..cb8a032 100644
--- a/server/service/src/main/java/com/doumee/core/utils/tyyun/TyyZosUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/tyyun/TyyZosUtil.java
@@ -172,11 +172,15 @@
if (inputStream != null) {
ObjectMetadata metadata = new ObjectMetadata();
+ metadata.setContentLength(inputStream.available());
+
PutObjectRequest request = new PutObjectRequest(bucketName, key, inputStream,metadata);
+ request.setCannedAcl(CannedAccessControlList.PublicRead);
PutObjectResult result = client.putObject(request);
+ return true;
}
}catch (Exception e){
- log.error("瀵硅薄瀛樺偍==================== 缃戠粶鏂囦欢涓婁紶澶辫触"+e.getMessage());
+ log.error("瀵硅薄瀛樺偍==================== 鏂囦欢涓婁紶澶辫触"+e.getMessage());
}finally {
shutDown();
}
diff --git a/server/service/src/main/java/com/doumee/core/wx/WxMiniConfig.java b/server/service/src/main/java/com/doumee/core/wx/WxMiniConfig.java
index 75eb95e..5b96af3 100644
--- a/server/service/src/main/java/com/doumee/core/wx/WxMiniConfig.java
+++ b/server/service/src/main/java/com/doumee/core/wx/WxMiniConfig.java
@@ -1,94 +1,61 @@
package com.doumee.core.wx;
-//import cn.binarywang.wx.miniapp.api.WxMaService;
-//import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-//import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
-//import com.doumee.config.mybatis.SpringUtils;
-//import com.github.binarywang.wxpay.config.WxPayConfig;
-//import com.github.binarywang.wxpay.constant.WxPayConstants;
-//import com.github.binarywang.wxpay.service.WxPayService;
-//import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
-//import org.apache.commons.lang3.StringUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.context.annotation.Configuration;
-//
-//import javax.annotation.PostConstruct;
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.mybatis.SpringUtils;
+import com.doumee.core.utils.Constants;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
/**
* 寰俊灏忕▼搴忕粍浠�
*/
-//@Configuration
+@Configuration
public class WxMiniConfig {
-// /********寰俊灏忕▼搴忔湇鍔�**********/
-// public static WxMaService wxMaService;
-// /********寰俊灏忕▼搴忔敮浠�**********/
-// public static WxPayService wxPayService;
-// /********寰俊APP鏀粯**********/
-// public static WxPayService wxAppPayService;
-//
-//
-// @Autowired
-// private WxPayProperties wxPayProperties;
-//
-// public static WxMiniConfig me() {
-// return SpringUtils.get().getBean(WxMiniConfig.class);
-// }
-//
-// @PostConstruct
-// void init() {
-// this.load_WxMaService();
-//// this.load_wxPayService();
-//// this.load_wxAppPayService();
-// }
-// /**
-// * 鍒濆鍖栧井淇″皬绋嬪簭
-// */
-// public void load_WxMaService() {
-// WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
-// config.setAppid(StringUtils.trimToNull(wxPayProperties.getAppId()));
-// config.setSecret(StringUtils.trimToNull(wxPayProperties.getAppSecret()));
-// config.setMsgDataFormat("JSON");
-// //config.setToken("");
-// //config.setAesKey("");
-// WxMaService wxMaService = new WxMaServiceImpl();
-// wxMaService.setWxMaConfig(config);
-// this.wxMaService = wxMaService;
-// }
+ /********瀹㈡埛绔� 寰俊灏忕▼搴忔湇鍔�**********/
+ public static WxMaService wxCustomerService;
+ /********鍛樺伐绔� 寰俊灏忕▼搴忔湇鍔�**********/
+ public static WxMaService wxPersonnelService;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ public static WxMiniConfig me() {
+ return SpringUtils.get().getBean(WxMiniConfig.class);
+ }
+
+ @PostConstruct
+ void init() {
+ this.load_WxCustomerService();
+ this.load_WxPersonnelService();
+ }
/**
- * 鍒濆鍖栧井淇″皬绋嬪簭鏀粯
+ * 鍒濆鍖栧井淇″皬绋嬪簭
*/
-// public void load_wxPayService() {
-// WxPayConfig payConfig = new WxPayConfig();
-// payConfig.setTradeType(WxPayConstants.TradeType.JSAPI);
-// payConfig.setSignType(WxPayConstants.SignType.MD5);
-// payConfig.setAppId(StringUtils.trimToNull(wxPayProperties.getAppId()));
-// payConfig.setMchId(StringUtils.trimToNull(wxPayProperties.getMchId()));
-// payConfig.setMchKey(StringUtils.trimToNull(wxPayProperties.getMchKey()));
-// payConfig.setKeyPath(StringUtils.trimToNull(wxPayProperties.getKeyPath()));
-// payConfig.setNotifyUrl(StringUtils.trimToNull(wxPayProperties.getNotifyUrl()));
-// WxPayService wxPayService = new WxPayServiceImpl();
-// wxPayService.setConfig(payConfig);
-// this.wxPayService = wxPayService;
-// }
+ public void load_WxCustomerService() {
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode()));
+ config.setSecret(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_SECRET_CUSTOMER).getCode()));
+ config.setMsgDataFormat("JSON");
+ WxMaService wxMaService = new WxMaServiceImpl();
+ wxMaService.setWxMaConfig(config);
+ this.wxCustomerService = wxMaService;
+ }
-// /**
-// * 鍒濆鍖朅pp鏀粯
-// */
-// public void load_wxAppPayService() {
-// WxPayConfig payConfig = new WxPayConfig();
-// payConfig.setTradeType(WxPayConstants.TradeType.APP);
-// payConfig.setSignType(WxPayConstants.SignType.MD5);
-// payConfig.setAppId("");
-// payConfig.setMchId(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_MchId.getCode())));
-// payConfig.setMchKey(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_MchKey.getCode())));
-// payConfig.setKeyPath(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_KeyPath.getCode())));
-// payConfig.setNotifyUrl(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_NotifyUrl.getCode())));
-// WxPayService wxPayService = new WxPayServiceImpl();
-// wxPayService.setConfig(payConfig);
-// this.wxAppPayService = wxPayService;
-// }
-
+ public void load_WxPersonnelService() {
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_PERSONNEL).getCode()));
+ config.setSecret(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_SECRET_PERSONNEL).getCode()));
+ config.setMsgDataFormat("JSON");
+ WxMaService wxMaService = new WxMaServiceImpl();
+ wxMaService.setWxMaConfig(config);
+ this.wxPersonnelService = wxMaService;
+ }
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/SmsEmailMapper.java b/server/service/src/main/java/com/doumee/dao/business/SmsEmailMapper.java
new file mode 100644
index 0000000..b10c7aa
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/SmsEmailMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.SmsEmail;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+public interface SmsEmailMapper extends BaseMapper<SmsEmail> {
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BjParam.java b/server/service/src/main/java/com/doumee/dao/business/model/BjParam.java
index fc01d45..326a0d5 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BjParam.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BjParam.java
@@ -48,8 +48,8 @@
@ExcelColumn(name="缂栬緫浜轰唬鐮�")
private Integer editor;
- @ApiModelProperty(value = "绫诲瀷0涓�绾ч厤缃� 1浜岀骇閰嶇疆")
- @ExcelColumn(name="绫诲瀷0涓�绾ч厤缃� 1浜岀骇閰嶇疆")
+ @ApiModelProperty(value = "绫诲瀷0姣涘澂 1绮捐")
+ @ExcelColumn(name="绫诲瀷0姣涘澂 1绮捐")
private String type;
@ApiModelProperty(value = "澶囨敞")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CrmInterfaceLog.java b/server/service/src/main/java/com/doumee/dao/business/model/CrmInterfaceLog.java
index df95b7c..51cc07a 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CrmInterfaceLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CrmInterfaceLog.java
@@ -59,7 +59,7 @@
@ApiModelProperty(value = "鍦板潃淇℃伅")
@ExcelColumn(name="鍦板潃淇℃伅")
- private Date url;
+ private String url;
@ApiModelProperty(value = "璇锋眰鍙傛暟")
@ExcelColumn(name="璇锋眰鍙傛暟")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Member.java b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
index 1ea48a1..36c57ea 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.business.dto.BaseQueryDto;
import io.swagger.annotations.ApiModel;
@@ -117,7 +118,7 @@
@ApiModelProperty(value = "鐪佷唤code")
@ExcelColumn(name="鐪佷唤code")
- private String provicneCode;
+ private String provinceCode;
@ApiModelProperty(value = "鍩庡競code")
@ExcelColumn(name="鍩庡競code")
@@ -155,4 +156,16 @@
@ExcelColumn(name="鏈�杩戞巿鏉冪粦瀹氬娉�")
private String authInfo;
+ @ApiModelProperty(value = "鍦板潃")
+ @ExcelColumn(name="鍦板潃")
+ private String address;
+
+ @ApiModelProperty(value = "鎴垮眿闈㈢Н")
+ @ExcelColumn(name="鎴垮眿闈㈢Н")
+ private BigDecimal housearea;
+
+ @ApiModelProperty(value = "鍓嶇紑")
+ @TableField(exist = false)
+ private String prefix;
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
index 3481422..ac4b8ee 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.business.dto.BaseQueryDto;
import io.swagger.annotations.ApiModel;
@@ -62,13 +63,16 @@
@ExcelColumn(name="绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
private Integer type;
- @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷 0鎺ㄥ箍璧勮澶氬浘 1鎺ㄥ箍璧勮瑙嗛 2瀹氬埗鏈嶅姟澶氬浘 3瀹氬埗鏈嶅姟瑙嗛", example = "1")
- @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷 0鎺ㄥ箍璧勮澶氬浘 1鎺ㄥ箍璧勮瑙嗛 2瀹氬埗鏈嶅姟澶氬浘 3瀹氬埗鏈嶅姟瑙嗛")
+ @ApiModelProperty(value = "闄勪欢瀵硅薄绫诲瀷 0news澶氬浘 1news瑙嗛", example = "1")
+ @ExcelColumn(name="闄勪欢瀵硅薄绫诲瀷 0news澶氬浘 1news瑙嗛")
private Integer objType;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@ExcelColumn(name="鏂囦欢鍦板潃")
private String fileurl;
+ @ApiModelProperty(value = "鏂囦欢鍦板潃瀹屾暣")
+ @TableField(exist = false)
+ private String fileurlFull;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/News.java b/server/service/src/main/java/com/doumee/dao/business/model/News.java
index 0d61f8d..0d633f5 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/News.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/News.java
@@ -11,6 +11,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 璧勮鍜屽畾鍒舵湇鍔′俊鎭〃
@@ -70,6 +71,9 @@
@ApiModelProperty(value = "璺宠浆绫诲瀷 0瀵屾枃鏈� 1澶栭摼", example = "1")
@ExcelColumn(name="璺宠浆绫诲瀷 0瀵屾枃鏈� 1澶栭摼")
private Integer linkType;
+ @ApiModelProperty(value = "闄勪欢绫诲瀷 0鍥剧墖 1瑙嗛", example = "1")
+ @ExcelColumn(name="闄勪欢绫诲瀷 0鍥剧墖 1瑙嗛")
+ private Integer fileType;
@ApiModelProperty(value = "鐘舵�� 0灞曠ず 1涓嶅睍绀�", example = "1")
@ExcelColumn(name="鐘舵�� 0灞曠ず 1涓嶅睍绀�")
@@ -102,6 +106,9 @@
@ExcelColumn(name="鏈�杩戝彂甯冧汉")
@TableField(exist = false)
private String publishUserName;
+ @ApiModelProperty(value = "闄勪欢闆嗗悎")
+ @TableField(exist = false)
+ private List<Multifile> fileList;
@ApiModelProperty(value = "绱犳潗绫诲瀷 0鎺ㄥ箍璧勮 1瀹氬埗鏈嶅姟", example = "1")
@ExcelColumn(name="绱犳潗绫诲瀷 0鎺ㄥ箍璧勮 1瀹氬埗鏈嶅姟")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java b/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
new file mode 100644
index 0000000..b266c44
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
@@ -0,0 +1,93 @@
+package com.doumee.dao.business.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鐭俊閭欢淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+@Data
+@ApiModel("鐭俊閭欢淇℃伅琛�")
+@TableName("`sms_email`")
+public class SmsEmail {
+
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ExcelColumn(name="涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿")
+
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "鏍囬")
+ @ExcelColumn(name="鏍囬")
+ private String title;
+
+ @ApiModelProperty(value = "绠�浠�")
+ @ExcelColumn(name="绠�浠�")
+ private String info;
+
+ @ApiModelProperty(value = "鍐呭")
+ @ExcelColumn(name="鍐呭")
+ private String content;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
+ @ExcelColumn(name="鎵嬫満鍙�")
+ private String phone;
+
+ @ApiModelProperty(value = "閭")
+ @ExcelColumn(name="閭")
+ private String email;
+
+ @ApiModelProperty(value = "鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢�")
+ @ExcelColumn(name="鐘舵�� 0鏈娇鐢� 1宸蹭娇鐢�")
+ private Integer status;
+
+ @ApiModelProperty(value = "绫诲瀷 0鐭俊 1閭欢")
+ @ExcelColumn(name="绫诲瀷 0鐭俊 1閭欢")
+ private Integer type;
+
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1")
+ @ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
+ private Integer objId;
+
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄绫诲瀷")
+ @ExcelColumn(name="鍏宠仈瀵硅薄绫诲瀷")
+ private String objType;
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Users.java b/server/service/src/main/java/com/doumee/dao/business/model/Users.java
index 1161564..0fd7ea5 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Users.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Users.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.business.dto.BaseQueryDto;
import io.swagger.annotations.ApiModel;
@@ -160,5 +161,22 @@
@ApiModelProperty(value = "鐢ㄦ埛瑙掕壊鍚嶇О闆嗗悎锛屽涓敤鑻辫閫楀彿闅斿紑")
@ExcelColumn(name="鐢ㄦ埛瑙掕壊鍚嶇О闆嗗悎锛屽涓敤鑻辫閫楀彿闅斿紑")
private String roleNames;
-
+ @ApiModelProperty(value = "鏄惁鍖呭惈涓嬬骇")
+ @TableField(exist = false)
+ private Boolean includeChild;
+ @ApiModelProperty(value = "鎵�灞炵粍缁囧悕绉�")
+ @TableField(exist = false)
+ private String shopName;
+ @ApiModelProperty(value = "缁勭粐绫诲瀷")
+ @TableField(exist = false)
+ private Integer shopType;
+ @ApiModelProperty(value = "缁勭粐绫诲瀷浜岀骇")
+ @TableField(exist = false)
+ private Integer shopSecType;
+ @ApiModelProperty(value = "瀹屾暣澶村儚褰�")
+ @TableField(exist = false)
+ private String imgurlFull;
+ @ApiModelProperty(value = "涓汉浜岀淮鐮佸浘鐗囧湴鍧�")
+ @TableField(exist = false)
+ private String qrcodeImgFull;
}
diff --git a/server/service/src/main/java/com/doumee/dao/web/reqeust/EditMemberRequest.java b/server/service/src/main/java/com/doumee/dao/web/reqeust/EditMemberRequest.java
new file mode 100644
index 0000000..4b56544
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/web/reqeust/EditMemberRequest.java
@@ -0,0 +1,71 @@
+package com.doumee.dao.web.reqeust;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/3/23 9:50
+ */
+@Data
+@ApiModel("淇敼瀹㈡埛绔敤鎴蜂俊鎭姹傜被")
+public class EditMemberRequest{
+
+ @ApiModelProperty(value = "鐢ㄦ埛涓婚敭")
+ private long memberId;
+
+ @ApiModelProperty(value = "澶村儚")
+ private String imgurl;
+
+ @ApiModelProperty(value = "濮撳悕")
+ private String name;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String phone;
+
+ @ApiModelProperty(value = "鍦板潃")
+ private String address;
+
+ @ApiModelProperty(value = "鐪佷唤鍚嶇О")
+ private String provinceName;
+
+ @ApiModelProperty(value = "鍩庡競鍚嶇О")
+ private String cityName;
+
+ @ApiModelProperty(value = "鍖哄煙鍚嶇О")
+ private String areaName;
+
+ @ApiModelProperty(value = "鐪佷唤code")
+ private String provinceCode;
+
+ @ApiModelProperty(value = "鍩庡競code")
+ private String cityCode;
+
+ @ApiModelProperty(value = "鍖哄煙code")
+ private String areaCode;
+
+ @ApiModelProperty(value = "灏忓尯鍚嶇О")
+ private String district;
+
+ @ApiModelProperty(value = "鎴垮眿闈㈢Н")
+ private BigDecimal housearea;
+
+ @ApiModelProperty(value = "鎴峰瀷淇℃伅锛屽鍘呭帹鍗槼鏁伴噺锛屾牸寮忥紙1-1-1-1-1锛�")
+ private String housetype;
+
+
+ @ApiModelProperty(value = "缁忓害", example = "1")
+ private BigDecimal longitude;
+
+ @ApiModelProperty(value = "绾害", example = "1")
+ private BigDecimal latitude;
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java b/server/service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java
deleted file mode 100644
index c7f204b..0000000
--- a/server/service/src/main/java/com/doumee/dao/web/reqeust/ErpVisitDTO.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.doumee.dao.web.reqeust;
-
-import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.haikang.model.param.BaseRequst;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2024/2/29 14:26
- */
-@Data
-@ApiModel("ERP璁垮鐢宠涓荤被")
-public class ErpVisitDTO extends BaseRequst {
-
- @NotBlank(message = "ERP璁板綍涓婚敭涓嶈兘涓虹┖")
- @ApiModelProperty(value = "ERP璁板綍涓婚敭")
- private String erpId;
-
- @NotBlank(message = "璁垮濮撳悕涓嶈兘涓虹┖")
- @ApiModelProperty(value = "璁垮濮撳悕")
- private String name;
-
- @NotBlank(message = "鎵嬫満鍙蜂笉鑳戒负绌�")
- @ApiModelProperty(value = "鎵嬫満鍙�")
- private String phone;
-
- @NotNull(message = "璇佷欢绫诲瀷涓嶈兘涓虹┖")
- @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収")
- private Integer idcardType;
-
- @NotBlank(message = "璇佷欢鍙蜂笉鑳戒负绌�")
- @ApiModelProperty(value = "璇佷欢鍙�")
- private String idcardNo;
-
- @ApiModelProperty(value = "浜鸿劯鐓х墖")
- private String faceImg;
-
- @ApiModelProperty(value = "鍋ュ悍璇�")
- private String imgurl;
-
- @NotBlank(message = "鍏徃鍚嶇О涓嶈兘涓虹┖")
- @ApiModelProperty(value = "鍏徃鍚嶇О")
- private String companyName;
-
- @NotBlank(message = "琚浜轰笉鑳戒负绌�")
- @ApiModelProperty(value = "琚浜� erp 涓婚敭 ")
- private String receptMemberId;
-
- @NotNull(message = "闂ㄧ鏈夋晥璧锋湡涓嶈兘涓虹┖")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
- private Date starttime;
-
- @NotNull(message = "闂ㄧ鏈夋晥姝㈡湡涓嶈兘涓虹┖")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熸埅姝�")
- private Date endtime;
-
- @NotBlank(message = "闂ㄧ缂栫爜涓嶈兘涓虹┖")
- @ApiModelProperty(value = "闂ㄧ缂栫爜 娴峰悍绯荤粺涓婚敭 锛屽涓敤鑻辨枃閫楀彿闅斿紑")
- private String doors;
-
- @NotBlank(message = "鏉ヨ浜嬬敱涓嶈兘涓虹┖")
- @ApiModelProperty(value = "鏉ヨ浜嬬敱")
- private String reason;
-
- @ApiModelProperty(value = "杞︾墝鍙�")
- private String carNos;
-
- @ApiModelProperty(value = "闅忚浜哄憳淇℃伅")
- List<ErpWithVisitDTO> erpWithVisitDTOList;
-}
diff --git a/server/service/src/main/java/com/doumee/dao/web/reqeust/ErpWithVisitDTO.java b/server/service/src/main/java/com/doumee/dao/web/reqeust/ErpWithVisitDTO.java
deleted file mode 100644
index dea3b32..0000000
--- a/server/service/src/main/java/com/doumee/dao/web/reqeust/ErpWithVisitDTO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.doumee.dao.web.reqeust;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2024/2/29 14:26
- */
-@Data
-@ApiModel("ERP璁垮鐢宠 闅忚浜轰俊鎭�")
-public class ErpWithVisitDTO {
-
- @ApiModelProperty(value = "璁垮濮撳悕")
- private String name;
-
- @ApiModelProperty(value = "鎵嬫満鍙�")
- private String phone;
-
- @ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収")
- private Integer idcardType;
-
- @ApiModelProperty(value = "璇佷欢鍙�")
- private String idcardNo;
-
- @ApiModelProperty(value = "浜鸿劯鐓х墖")
- private String faceImg;
-
- @ApiModelProperty(value = "鍋ュ悍璇�")
- private String imgurl;
-
- @ApiModelProperty(value = "鍏徃鍚嶇О")
- private String companyName;
-
- @ApiModelProperty(value = "杞︾墝鍙�")
- private String carNos;
-
-
-
-}
diff --git a/server/service/src/main/java/com/doumee/dao/web/reqeust/FinishAnswerDTO.java b/server/service/src/main/java/com/doumee/dao/web/reqeust/FinishAnswerDTO.java
deleted file mode 100644
index a63e42d..0000000
--- a/server/service/src/main/java/com/doumee/dao/web/reqeust/FinishAnswerDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.doumee.dao.web.reqeust;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2023/12/7 11:19
- */
-@Data
-public class FinishAnswerDTO {
-
- @NotBlank(message = "绛旈鏄庣粏涓虹┖")
- @ApiModelProperty(value = "绛旈鏄庣粏锛坖son锛�")
- private String content;
-
- @NotNull(message = "浣跨敤鍦烘櫙涓虹┖")
- @ApiModelProperty(value = "浣跨敤鍦烘櫙 0鍔冲姟浜哄憳 1鏅�氳瀹�")
- private Integer useType;
-
- @ApiModelProperty(value = "璁垮缂栫爜")
- private String userId;
-
- @ApiModelProperty(value = "鐢ㄦ埛openId")
- private String openId;
-
-}
diff --git a/server/service/src/main/java/com/doumee/dao/web/reqeust/VisitRecordDTO.java b/server/service/src/main/java/com/doumee/dao/web/reqeust/VisitRecordDTO.java
deleted file mode 100644
index 5613c7d..0000000
--- a/server/service/src/main/java/com/doumee/dao/web/reqeust/VisitRecordDTO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.doumee.dao.web.reqeust;
-
-import com.doumee.core.utils.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2023/12/7 11:19
- */
-@Data
-public class VisitRecordDTO {
-
- @ApiModelProperty(value = "鏉ヨ浜哄憳鍚嶇О")
- private String name;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿寮�濮� yyyy-MM-dd HH:mm:ss")
- private String createTimeS;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿缁撴潫 yyyy-MM-dd HH:mm:ss")
- private String createTimeE;
-
- @ApiModelProperty(value = "璁垮璁板綍绫诲瀷: 0鍔冲姟璁垮 1鏅�氳瀹�")
- private Integer type;
-
- @ApiModelProperty(value = "鏌ヨ鐘舵�侊細0=寰呭鎵癸紱1=宸插鎵癸紱2=鎴戝彂璧风殑")
- private Integer state;
-
- @ApiModelProperty(value = "鐢ㄦ埛涓婚敭",hidden = true)
- private Integer memberId;
-
-}
diff --git a/server/service/src/main/java/com/doumee/dao/web/reqeust/WxPhoneRequest.java b/server/service/src/main/java/com/doumee/dao/web/reqeust/WxPhoneRequest.java
new file mode 100644
index 0000000..382e6a3
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/web/reqeust/WxPhoneRequest.java
@@ -0,0 +1,32 @@
+package com.doumee.dao.web.reqeust;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/3/23 9:50
+ */
+@Data
+@ApiModel("寰俊鎺堟潈鎵嬫満鍙疯姹傜被")
+public class WxPhoneRequest{
+
+ @NotEmpty(message = "encryptedData 涓嶈兘涓虹┖")
+ @ApiModelProperty(value = "encryptedData")
+ private String encryptedData;
+
+ @NotEmpty(message = "iv 涓嶈兘涓虹┖")
+ @ApiModelProperty(value = "iv")
+ private String iv;
+
+ @NotEmpty(message = "sessionKey 涓嶈兘涓虹┖")
+ @ApiModelProperty(value = "sessionKey")
+ private String sessionKey;
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/web/response/AccountResponse.java b/server/service/src/main/java/com/doumee/dao/web/response/AccountResponse.java
new file mode 100644
index 0000000..50f22e9
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/web/response/AccountResponse.java
@@ -0,0 +1,32 @@
+package com.doumee.dao.web.response;
+
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.Users;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/3/23 9:25
+ */
+@Data
+@ApiModel("鐧诲綍杩斿洖绫�")
+public class AccountResponse implements Serializable {
+
+ @ApiModelProperty(value = "鐢ㄦ埛token")
+ private String token;
+
+ @ApiModelProperty(value = "寰俊sessionKey")
+ private String sessionKey;
+
+ @ApiModelProperty(value = "鐢ㄦ埛淇℃伅 - 瀹㈡埛绔�")
+ private Member member;
+
+ @ApiModelProperty(value = "鐢ㄦ埛淇℃伅 - 瀹㈡埛绔�")
+ private Users users;
+}
diff --git a/server/service/src/main/java/com/doumee/dao/web/response/BjParamConfigResponse.java b/server/service/src/main/java/com/doumee/dao/web/response/BjParamConfigResponse.java
new file mode 100644
index 0000000..191943c
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/web/response/BjParamConfigResponse.java
@@ -0,0 +1,29 @@
+package com.doumee.dao.web.response;
+
+import com.doumee.dao.business.model.BjParam;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.Users;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/3/23 9:25
+ */
+@Data
+@ApiModel("鎶ヤ环閰嶇疆淇℃伅")
+public class BjParamConfigResponse implements Serializable {
+
+ @ApiModelProperty(value = "姣涘澂閰嶇疆")
+ private List<BjParam> roughList;
+
+ @ApiModelProperty(value = "绮捐閰嶇疆")
+ private List<BjParam> exquisiteList;
+
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/BjParamService.java b/server/service/src/main/java/com/doumee/service/business/BjParamService.java
index 2fc71f7..90316f6 100644
--- a/server/service/src/main/java/com/doumee/service/business/BjParamService.java
+++ b/server/service/src/main/java/com/doumee/service/business/BjParamService.java
@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.BjParam;
+import com.doumee.dao.web.response.BjParamConfigResponse;
+
import java.util.List;
/**
@@ -96,4 +98,9 @@
long count(BjParam bjParam);
List<BjParam> findTree();
+
+ BjParamConfigResponse getBjParamConfig();
+
+
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/InitService.java b/server/service/src/main/java/com/doumee/service/business/InitService.java
index b29b458..b8660df 100644
--- a/server/service/src/main/java/com/doumee/service/business/InitService.java
+++ b/server/service/src/main/java/com/doumee/service/business/InitService.java
@@ -36,6 +36,10 @@
public void initIamAppIdAndAppKey(){
redisTemplate.opsForValue().set(Constants.RedisKeys.IAM_APPKEY,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_IAM_APPKEY).getCode());
redisTemplate.opsForValue().set(Constants.RedisKeys.IAM_APPID,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_IAM_APPID).getCode());
+ redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_CRM_API_KEY,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_CRM_API_KEY).getCode());
+ redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_CRM_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_CRM_API_URL).getCode());
+ redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_SMS_API_URL,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_SMS_API_URL).getCode());
+ redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_SMS_API_KEY,systemDictDataBiz.queryByCode(Constants.ZBOM,Constants.ZBOM_SMS_API_KEY).getCode());
}
@PostConstruct
public void cacheShopTree(){
diff --git a/server/service/src/main/java/com/doumee/service/business/MemberService.java b/server/service/src/main/java/com/doumee/service/business/MemberService.java
index c2ddb0b..05ba621 100644
--- a/server/service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/service/src/main/java/com/doumee/service/business/MemberService.java
@@ -3,6 +3,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.web.reqeust.EditMemberRequest;
+import com.doumee.dao.web.reqeust.WxPhoneRequest;
+import com.doumee.dao.web.response.AccountResponse;
+
import java.util.List;
/**
@@ -94,4 +98,29 @@
* @return long
*/
long count(Member member);
+
+ /**
+ * 瀹㈡埛绔敤鎴锋巿鏉冪櫥褰�
+ * @param code
+ * @return
+ */
+ AccountResponse wxLogin(String code);
+
+ /**
+ * 鑾峰彇鎵嬫満鍙�
+ * @param wxPhoneRequest
+ * @return
+ */
+ String getWxMiniPhone(WxPhoneRequest wxPhoneRequest);
+
+ /**
+ * 鏇存柊涓汉淇℃伅
+ * @param editMemberRequest
+ */
+ void updMemberDetail(EditMemberRequest editMemberRequest);
+
+
+ Member getMemberInfo(Long memberId);
+
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/SmsEmailService.java b/server/service/src/main/java/com/doumee/service/business/SmsEmailService.java
new file mode 100644
index 0000000..15bf27f
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/SmsEmailService.java
@@ -0,0 +1,98 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.SmsEmail;
+
+import java.util.List;
+
+/**
+ * 鐭俊閭欢淇℃伅琛⊿ervice瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+public interface SmsEmailService {
+
+ /**
+ * 鍒涘缓
+ *
+ * @param smsEmail 瀹炰綋瀵硅薄
+ * @return Integer
+ */
+ Integer create(SmsEmail smsEmail);
+ Integer sendSms(SmsEmail smsEmail);
+ /**
+ * 涓婚敭鍒犻櫎
+ *
+ * @param id 涓婚敭
+ */
+ void deleteById(Integer id);
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param smsEmail 瀹炰綋瀵硅薄
+ */
+ void delete(SmsEmail smsEmail);
+
+ /**
+ * 鎵归噺涓婚敭鍒犻櫎
+ *
+ * @param ids 涓婚敭闆�
+ */
+ void deleteByIdInBatch(List<Integer> ids);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param smsEmail 瀹炰綋瀵硅薄
+ */
+ void updateById(SmsEmail smsEmail);
+
+ /**
+ * 鎵归噺涓婚敭鏇存柊
+ *
+ * @param smsEmails 瀹炰綋闆�
+ */
+ void updateByIdInBatch(List<SmsEmail> smsEmails);
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return SmsEmail
+ */
+ SmsEmail findById(Integer id);
+
+ /**
+ * 鏉′欢鏌ヨ鍗曟潯璁板綍
+ *
+ * @param smsEmail 瀹炰綋瀵硅薄
+ * @return SmsEmail
+ */
+ SmsEmail findOne(SmsEmail smsEmail);
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param smsEmail 瀹炰綋瀵硅薄
+ * @return List<SmsEmail>
+ */
+ List<SmsEmail> findList(SmsEmail smsEmail);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<SmsEmail>
+ */
+ PageData<SmsEmail> findPage(PageWrap<SmsEmail> pageWrap);
+
+ /**
+ * 鏉′欢缁熻
+ *
+ * @param smsEmail 瀹炰綋瀵硅薄
+ * @return long
+ */
+ long count(SmsEmail smsEmail);
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/UsersService.java b/server/service/src/main/java/com/doumee/service/business/UsersService.java
index d1a6234..894d3f4 100644
--- a/server/service/src/main/java/com/doumee/service/business/UsersService.java
+++ b/server/service/src/main/java/com/doumee/service/business/UsersService.java
@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Users;
+import com.doumee.dao.web.response.AccountResponse;
+
import java.util.List;
/**
@@ -94,4 +96,10 @@
* @return long
*/
long count(Users users);
+
+ AccountResponse phoneLogin(String phone, String code);
+
+ AccountResponse wxLogin(String code);
+
+ void bindingOpenid(String code,Long userId);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
index 3c6b40c..68e743d 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BjParamServiceImpl.java
@@ -9,6 +9,7 @@
import com.doumee.dao.business.model.BjParam;
import com.doumee.dao.business.model.News;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.web.response.BjParamConfigResponse;
import com.doumee.service.business.BjParamService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -23,6 +24,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 蹇楅偊瀹堕�夎绠楀櫒閰嶇疆淇℃伅琛ㄦ姤浠稴ervice瀹炵幇
@@ -206,4 +208,22 @@
QueryWrapper<BjParam> wrapper = new QueryWrapper<>(bjParam);
return bjParamMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public BjParamConfigResponse getBjParamConfig(){
+ BjParamConfigResponse bjParamConfigResponse = new BjParamConfigResponse();
+ List<BjParam> bjParamList = bjParamMapper.selectList(new QueryWrapper<BjParam>()
+ .lambda().eq(BjParam::getIsdeleted,Constants.ZERO));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(bjParamList)){
+ List<BjParam> roughList = bjParamList.stream().filter(i->i.getType().equals(Constants.ZERO)).collect(Collectors.toList());
+ List<BjParam> exquisiteList = bjParamList.stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList());
+ bjParamConfigResponse.setRoughList(roughList);
+ bjParamConfigResponse.setExquisiteList(exquisiteList);
+ }
+ return bjParamConfigResponse;
+ }
+
+
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java
index acbd595..bc518e9 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java
@@ -119,8 +119,7 @@
queryWrapper.lambda().eq(CrmInterfaceLog::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getUrl() != null) {
- queryWrapper.lambda().ge(CrmInterfaceLog::getUrl, Utils.Date.getStart(pageWrap.getModel().getUrl()));
- queryWrapper.lambda().le(CrmInterfaceLog::getUrl, Utils.Date.getEnd(pageWrap.getModel().getUrl()));
+ queryWrapper.lambda().like(CrmInterfaceLog::getUrl, pageWrap.getModel().getUrl());
}
if (pageWrap.getModel().getRequest() != null) {
queryWrapper.lambda().eq(CrmInterfaceLog::getRequest, pageWrap.getModel().getRequest());
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
index 7c9a030..fd74554 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
@@ -181,4 +181,18 @@
QueryWrapper<Customer> wrapper = new QueryWrapper<>(customer);
return customerMapper.selectCount(wrapper);
}
+
+
+
+
+ public void saveRenovationCalculator(){
+
+
+
+ }
+
+
+
+
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index a27a5d0..80576f9 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1,21 +1,45 @@
package com.doumee.service.business.impl;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.Jwt.JwtPayLoad;
+import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.oss.FileModel;
+import com.doumee.core.utils.CodeVerifyUtils;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.web.reqeust.EditMemberRequest;
+import com.doumee.dao.web.reqeust.WxPhoneRequest;
+import com.doumee.dao.web.response.AccountResponse;
import com.doumee.service.business.MemberService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import me.chanjar.weixin.common.error.WxErrorException;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.List;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* 鐢ㄦ埛淇℃伅琛⊿ervice瀹炵幇
@@ -27,6 +51,12 @@
@Autowired
private MemberMapper memberMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private RedisTemplate<String,Object> redisTemplate;
@Override
public Long create(Member member) {
@@ -164,8 +194,8 @@
if (pageWrap.getModel().getAreaName() != null) {
queryWrapper.lambda().eq(Member::getAreaName, pageWrap.getModel().getAreaName());
}
- if (pageWrap.getModel().getProvicneCode() != null) {
- queryWrapper.lambda().eq(Member::getProvicneCode, pageWrap.getModel().getProvicneCode());
+ if (pageWrap.getModel().getProvinceCode() != null) {
+ queryWrapper.lambda().eq(Member::getProvinceCode, pageWrap.getModel().getProvinceCode());
}
if (pageWrap.getModel().getCityCode() != null) {
queryWrapper.lambda().eq(Member::getCityCode, pageWrap.getModel().getCityCode());
@@ -216,4 +246,92 @@
QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
return memberMapper.selectCount(wrapper);
}
+
+
+
+ @Override
+ public AccountResponse wxLogin(String code){
+// try {
+ //鑾峰彇寰俊鏁忔劅鏁版嵁
+// WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
+// String openId = session.getOpenid();
+// if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
+// }
+ String openId = code;
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
+ if (member == null) {
+ member = new Member();
+ member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
+ member.setCreateDate(new Date());
+ member.setIsdeleted(Constants.ZERO);
+ member.setType(Constants.ZERO);
+ memberMapper.insert(member);
+ }
+ //鍒涘缓token
+ JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
+ String token = JwtTokenUtil.generateToken(payLoad);
+ AccountResponse accountResponse = new AccountResponse();
+ accountResponse.setToken(token);
+// accountResponse.setSessionKey(session.getSessionKey());
+ accountResponse.setMember(member);
+ return accountResponse;
+// } catch (WxErrorException e) {
+// e.printStackTrace();
+// }
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
+ }
+
+ @Override
+ public String getWxMiniPhone(WxPhoneRequest wxPhoneRequest){
+ try {
+ WxMaPhoneNumberInfo userPhoneInfo = WxMiniConfig.wxCustomerService.getUserService().getPhoneNoInfo(
+ wxPhoneRequest.getSessionKey(), wxPhoneRequest.getEncryptedData(), wxPhoneRequest.getIv());
+ //鑾峰彇鎵嬫満鍙�
+ String phone= userPhoneInfo.getPurePhoneNumber();
+ if(Objects.isNull(phone)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈幏鍙栧埌鎵嬫満鍙�");
+ }
+ return phone;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏇存柊鎵嬫満鍙峰け璐�");
+ }
+
+ @Override
+ public void updMemberDetail(EditMemberRequest editMemberRequest){
+ memberMapper.update(new UpdateWrapper<Member>()
+ .lambda()
+ .set(StringUtils.isNotBlank(editMemberRequest.getImgurl()),Member::getImgurl,editMemberRequest.getImgurl())
+ .set(StringUtils.isNotBlank(editMemberRequest.getName()),Member::getName,editMemberRequest.getName())
+ .set(StringUtils.isNotBlank(editMemberRequest.getPhone()),Member::getPhone,editMemberRequest.getPhone())
+ .set(StringUtils.isNotBlank(editMemberRequest.getProvinceName()),Member::getProvinceName,editMemberRequest.getProvinceName())
+ .set(StringUtils.isNotBlank(editMemberRequest.getProvinceCode()),Member::getProvinceCode,editMemberRequest.getProvinceCode())
+ .set(StringUtils.isNotBlank(editMemberRequest.getCityCode()),Member::getCityCode,editMemberRequest.getCityCode())
+ .set(StringUtils.isNotBlank(editMemberRequest.getCityName()),Member::getCityName,editMemberRequest.getCityName())
+ .set(StringUtils.isNotBlank(editMemberRequest.getAreaCode()),Member::getAreaCode,editMemberRequest.getAreaCode())
+ .set(StringUtils.isNotBlank(editMemberRequest.getAreaName()),Member::getAreaName,editMemberRequest.getAreaName())
+ .set(StringUtils.isNotBlank(editMemberRequest.getAddress()),Member::getAddress,editMemberRequest.getAddress())
+ .set(StringUtils.isNotBlank(editMemberRequest.getDistrict()),Member::getDistrict,editMemberRequest.getDistrict())
+ .set(Objects.nonNull(editMemberRequest.getHousearea()),Member::getHousearea,editMemberRequest.getHousearea())
+ .set(StringUtils.isNotBlank(editMemberRequest.getHousetype()),Member::getHousetype,editMemberRequest.getHousetype())
+ .set(Objects.nonNull(editMemberRequest.getLatitude()),Member::getLatitude,editMemberRequest.getLatitude())
+ .set(Objects.nonNull(editMemberRequest.getLongitude()),Member::getLongitude,editMemberRequest.getLongitude())
+ .eq(Member::getId,editMemberRequest.getMemberId()));
+
+ }
+
+ @Override
+ public Member getMemberInfo(Long memberId){
+ Member member = memberMapper.selectById(memberId);
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
+ member.setPrefix(prefix);
+ return member;
+ }
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
index 5bc8b55..f51413f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
@@ -1,19 +1,32 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.MultifileMapper;
import com.doumee.dao.business.NewsMapper;
+import com.doumee.dao.business.model.BjParam;
+import com.doumee.dao.business.model.Multifile;
import com.doumee.dao.business.model.News;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.NewsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -26,16 +39,60 @@
@Autowired
private NewsMapper newsMapper;
+ @Autowired
+ private MultifileMapper multifileMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
- public Long create(News news) {
- newsMapper.insert(news);
- return news.getId();
+ @Transactional
+ public Long create(News param) {
+ LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ param.setIsdeleted(Constants.ZERO);
+ param.setEditor(userInfo.getId());
+ param.setCreator(userInfo.getId());
+ param.setStatus(Constants.formatIntegerNum(param.getStatus()));
+ param.setCreateDate(new Date());
+ param.setEditDate(param.getCreateDate());
+ param.setPublishUserid(param.getCreator());
+ param.setFileType(Constants.formatIntegerNum(param.getFileType()));
+ newsMapper.insert(param);
+ if(param.getFileList()!=null && param.getFileList().size()>0){
+ List<Multifile> multifiles = new ArrayList<>();
+ int index =1;
+ for(Multifile f : param.getFileList()){
+ if(StringUtils.isNotBlank(f.getFileurl())){
+ f.setId(null);
+ f.setIsdeleted(Constants.ZERO);
+ f.setObjId(param.getId());
+ f.setType(StringUtils.endsWith(f.getFileurl(),".mp4")?Constants.ONE:Constants.ZERO);
+ f.setObjType(Constants.MultiFile.NEWS_FILE.getKey());
+ f.setCreator(param.getCreator());
+ f.setCreateDate(param.getCreateDate());
+ f.setSortnum(index++);
+ multifiles.add(f);
+ }
+ }
+ if(multifiles.size()>0){
+ multifileMapper.insert(multifiles);
+ }
+ }
+ return param.getId();
}
@Override
public void deleteById(Long id) {
- newsMapper.deleteById(id);
+ LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ newsMapper.update(null,new UpdateWrapper<News>().lambda()
+ .set(News::getIsdeleted,Constants.ONE )
+ .set(News::getEditor,userInfo.getId() )
+ .set(News::getEditDate,new Date() )
+ .eq(News::getId,id));
+ multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+ .set(Multifile::getIsdeleted,Constants.ONE )
+ .eq(Multifile::getIsdeleted,Constants.ZERO )
+ .eq(Multifile::getObjType,Constants.MultiFile.NEWS_FILE.getKey())
+ .eq(Multifile::getObjId,id));
}
@Override
@@ -49,12 +106,44 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- newsMapper.deleteBatchIds(ids);
+ for(Long id : ids){
+ deleteById(id);
+ }
}
@Override
+ @Transactional
public void updateById(News news) {
+ LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ news.setEditor(userInfo.getId());
+ news.setEditDate(new Date());
+ news.setPublishUserid(news.getEditor());
newsMapper.updateById(news);
+ if(news.getFileList()!=null && news.getFileList().size()>0){
+ List<Multifile> multifiles = new ArrayList<>();
+ int index =1;
+ for(Multifile f : news.getFileList()){
+ if(StringUtils.isNotBlank(f.getFileurl())){
+ f.setId(null);
+ f.setIsdeleted(Constants.ZERO);
+ f.setType(StringUtils.endsWith(f.getFileurl(),".mp4")?Constants.ONE:Constants.ZERO);
+ f.setObjId(news.getId());
+ f.setObjType(Constants.MultiFile.NEWS_FILE.getKey());
+ f.setCreator(news.getCreator());
+ f.setCreateDate(news.getCreateDate());
+ f.setSortnum(index++);
+ multifiles.add(f);
+ }
+ }
+ if(multifiles.size()>0){
+ multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+ .set(Multifile::getIsdeleted,Constants.ONE )
+ .eq(Multifile::getIsdeleted,Constants.ZERO )
+ .eq(Multifile::getObjType,Constants.MultiFile.NEWS_FILE.getKey())
+ .eq(Multifile::getObjId,news.getId() ));
+ multifileMapper.insert(multifiles);
+ }
+ }
}
@Override
@@ -87,76 +176,141 @@
@Override
public PageData<News> findPage(PageWrap<News> pageWrap) {
IPage<News> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<News> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<News> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,News::getEditor)
+ .selectAll(News.class)
+ .selectAs(SystemUser::getRealname,News::getEditorName);
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(News::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(News::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(News::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(News::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(News::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(News::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(News::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(News::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(News::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(News::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(News::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(News::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(News::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(News::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(News::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(News::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(News::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(News::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().like(News::getTitle, pageWrap.getModel().getTitle());
+ queryWrapper.like(News::getTitle, pageWrap.getModel().getTitle());
}
if (pageWrap.getModel().getSubTitle() != null) {
- queryWrapper.lambda().eq(News::getSubTitle, pageWrap.getModel().getSubTitle());
+ queryWrapper.eq(News::getSubTitle, pageWrap.getModel().getSubTitle());
}
if (pageWrap.getModel().getSortnum() != null) {
- queryWrapper.lambda().eq(News::getSortnum, pageWrap.getModel().getSortnum());
+ queryWrapper.eq(News::getSortnum, pageWrap.getModel().getSortnum());
}
if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(News::getContent, pageWrap.getModel().getContent());
+ queryWrapper.eq(News::getContent, pageWrap.getModel().getContent());
}
if (pageWrap.getModel().getLinkType() != null) {
- queryWrapper.lambda().eq(News::getLinkType, pageWrap.getModel().getLinkType());
+ queryWrapper.eq(News::getLinkType, pageWrap.getModel().getLinkType());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(News::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(News::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getLookNum() != null) {
- queryWrapper.lambda().eq(News::getLookNum, pageWrap.getModel().getLookNum());
+ queryWrapper.eq(News::getLookNum, pageWrap.getModel().getLookNum());
}
if (pageWrap.getModel().getDonwloadNum() != null) {
- queryWrapper.lambda().eq(News::getDonwloadNum, pageWrap.getModel().getDonwloadNum());
+ queryWrapper.eq(News::getDonwloadNum, pageWrap.getModel().getDonwloadNum());
}
if (pageWrap.getModel().getPublishDate() != null) {
- queryWrapper.lambda().ge(News::getPublishDate, Utils.Date.getStart(pageWrap.getModel().getPublishDate()));
- queryWrapper.lambda().le(News::getPublishDate, Utils.Date.getEnd(pageWrap.getModel().getPublishDate()));
+ queryWrapper.ge(News::getPublishDate, Utils.Date.getStart(pageWrap.getModel().getPublishDate()));
+ queryWrapper.le(News::getPublishDate, Utils.Date.getEnd(pageWrap.getModel().getPublishDate()));
}
if (pageWrap.getModel().getPublishUserid() != null) {
- queryWrapper.lambda().eq(News::getPublishUserid, pageWrap.getModel().getPublishUserid());
+ queryWrapper.eq(News::getPublishUserid, pageWrap.getModel().getPublishUserid());
}
if (pageWrap.getModel().getPublishInfo() != null) {
- queryWrapper.lambda().eq(News::getPublishInfo, pageWrap.getModel().getPublishInfo());
+ queryWrapper.eq(News::getPublishInfo, pageWrap.getModel().getPublishInfo());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(News::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(News::getType, pageWrap.getModel().getType());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
+
+ PageData<News> pageData = PageData.from(newsMapper.selectJoinPage(page, News.class,queryWrapper));
+ if(pageData!=null && pageData.getRecords()!=null && pageData.getRecords().size()>0){
+
+ List<Long> idList = new ArrayList<>();
+ for(News model : pageData.getRecords()){
+ idList.add(model.getId());
}
- queryWrapper.orderByAsc(sortData.getProperty());
+ List<Multifile> files = dealMultifileList(idList);
+ for(News model : pageData.getRecords()){
+ setFilelistById(model,files);
+ }
+
}
- return PageData.from(newsMapper.selectPage(page, queryWrapper));
+ return pageData;
+ }
+
+ private void setFilelistById(News model, List<Multifile> multifiles) {
+ if(multifiles!=null && multifiles.size()>0){
+ for(Multifile f : multifiles){
+ if(Constants.equalsLong(f.getObjId(),model.getId())){
+ if(Constants.equalsInteger(model.getType(),Constants.ZERO) &&Constants.equalsInteger(model.getFileType(),Constants.ONE) && Constants.equalsInteger(f.getType(),Constants.ONE)){
+ //濡傛灉鏄棰�
+ if(model.getFileList() == null){
+ model.setFileList(new ArrayList<>());
+ }
+ model.getFileList().add(f);
+ break;
+ }
+ if(Constants.equalsInteger(model.getType(),Constants.ZERO) && Constants.equalsInteger(model.getFileType(),Constants.ZERO) && Constants.equalsInteger(f.getType(),Constants.ZERO)){
+ //濡傛灉鏄棰�
+ if(model.getFileList() == null){
+ model.setFileList(new ArrayList<>());
+ }
+ model.getFileList().add(f);
+ }
+
+ if(Constants.equalsInteger(model.getType(),Constants.ONE)){
+ //濡傛灉鏄棰�
+ if(model.getFileList() == null){
+ model.setFileList(new ArrayList<>());
+ }
+ model.getFileList().add(f);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ private List<Multifile> dealMultifileList(List<Long> idList) {
+ List<Integer> types = new ArrayList<>();
+ types.add(Constants.MultiFile.NEWS_FILE.getKey());
+ List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO )
+ .in(Multifile::getObjType,types)
+ .in(Multifile::getObjId,idList )
+ .orderByAsc(Multifile::getSortnum)
+ );
+ if(multifiles!=null && multifiles.size()>0){
+ String path = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH ).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.NEWS_FILE ).getCode();
+ for(Multifile f : multifiles){
+ if(StringUtils.isNotBlank(f.getFileurl())){
+ f.setFileurlFull(path + f.getFileurl());
+ }
+ }
+ }
+ return multifiles;
}
@Override
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
new file mode 100644
index 0000000..052a192
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -0,0 +1,231 @@
+package com.doumee.service.business.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.SmsEmailMapper;
+import com.doumee.dao.business.model.SmsEmail;
+import com.doumee.service.business.SmsEmailService;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐭俊閭欢淇℃伅琛⊿ervice瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+@Service
+public class SmsEmailServiceImpl implements SmsEmailService {
+
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+
+ public static void isCaptcheValide(SmsEmailMapper smsEmailMapper, String phone, String captche) {
+ SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
+ .eq(SmsEmail::getType, Constants.ZERO)
+ .eq(SmsEmail::getPhone, phone)
+ .eq(SmsEmail::getRemark, captche)
+ .eq(SmsEmail::getIsdeleted, Constants.ZERO)
+ );
+ if(model == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佷笉姝ｇ‘锛岃閲嶆柊鍙戦�佸啀璇曪紒");
+ }
+ if(!Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佸凡澶辨晥锛岃閲嶆柊鍙戦�佸啀璇曪紒");
+ }
+ if(model.getCreateDate() !=null &&
+ System.currentTimeMillis() - model.getCreateDate().getTime() > 3*60*1000){
+ model.setStatus(Constants.ONE);
+ model.setEditDate(new Date());
+ smsEmailMapper.updateById(model);
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佸凡澶辨晥锛岃閲嶆柊鍙戦�佸啀璇晘");
+ }
+ model.setStatus(Constants.ONE);
+ model.setEditDate(new Date());
+ smsEmailMapper.updateById(model);
+ }
+
+ @Override
+ public Integer create(SmsEmail smsEmail) {
+ smsEmailMapper.insert(smsEmail);
+ return smsEmail.getId();
+ }
+
+ @Override
+ public Integer sendSms(SmsEmail smsEmail) {
+ if(StringUtils.isBlank(smsEmail.getPhone())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ String nowDate = DateUtil.getFomartDate(new Date(),"yyyy-MM-dd HH:mm:ss");
+ if(smsEmailMapper.selectCount(new QueryWrapper<SmsEmail>().lambda()
+ .eq(SmsEmail::getPhone,smsEmail.getPhone())
+ .eq(SmsEmail::getType,Constants.ZERO)
+ .between(SmsEmail::getCreateDate, DateUtil.getFomartDate(DateUtil.afterMinutesDate(-5),"yyyy-MM-dd HH:mm:ss"),nowDate)
+ )>=3){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝瓒呭嚭鍙戦�佹鏁帮紝璇风◢鍚庨噸璇曪紒");
+ }
+
+ String code = Constants.getRandom6Num();
+
+ String content = //systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode()+
+
+ "楠岃瘉鐮佷负锛�"+code+"锛屾楠岃瘉鐮佹湁鏁堜负3鍒嗛挓銆傝鍕挎硠闇�";
+
+
+ smsEmail.setRemark(code);
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setStatus(Constants.ZERO);
+ smsEmail.setType(Constants.ZERO);
+ smsEmail.setTitle("鐭俊楠岃瘉鐮�");
+ smsEmail.setContent(content);
+ smsEmailMapper.insert(smsEmail);
+
+ return smsEmail.getId();
+
+ }
+
+
+ @Override
+ public void deleteById(Integer id) {
+ smsEmailMapper.deleteById(id);
+ }
+
+ @Override
+ public void delete(SmsEmail smsEmail) {
+ UpdateWrapper<SmsEmail> deleteWrapper = new UpdateWrapper<>(smsEmail);
+ smsEmailMapper.delete(deleteWrapper);
+ }
+
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ smsEmailMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void updateById(SmsEmail smsEmail) {
+ smsEmailMapper.updateById(smsEmail);
+ }
+
+ @Override
+ public void updateByIdInBatch(List<SmsEmail> smsEmails) {
+ if (CollectionUtils.isEmpty(smsEmails)) {
+ return;
+ }
+ for (SmsEmail smsEmail: smsEmails) {
+ this.updateById(smsEmail);
+ }
+ }
+
+ @Override
+ public SmsEmail findById(Integer id) {
+ return smsEmailMapper.selectById(id);
+ }
+
+ @Override
+ public SmsEmail findOne(SmsEmail smsEmail) {
+ QueryWrapper<SmsEmail> wrapper = new QueryWrapper<>(smsEmail);
+ return smsEmailMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<SmsEmail> findList(SmsEmail smsEmail) {
+ QueryWrapper<SmsEmail> wrapper = new QueryWrapper<>(smsEmail);
+ return smsEmailMapper.selectList(wrapper);
+ }
+
+ @Override
+ public PageData<SmsEmail> findPage(PageWrap<SmsEmail> pageWrap) {
+ IPage<SmsEmail> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<SmsEmail> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(SmsEmail::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(SmsEmail::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(SmsEmail::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(SmsEmail::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getRemark() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getRemark, pageWrap.getModel().getRemark());
+ }
+ if (pageWrap.getModel().getTitle() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getTitle, pageWrap.getModel().getTitle());
+ }
+ if (pageWrap.getModel().getInfo() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getInfo, pageWrap.getModel().getInfo());
+ }
+ if (pageWrap.getModel().getContent() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getContent, pageWrap.getModel().getContent());
+ }
+ if (pageWrap.getModel().getPhone() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getPhone, pageWrap.getModel().getPhone());
+ }
+ if (pageWrap.getModel().getEmail() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getEmail, pageWrap.getModel().getEmail());
+ }
+ if (pageWrap.getModel().getStatus() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getStatus, pageWrap.getModel().getStatus());
+ }
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getType, pageWrap.getModel().getType());
+ }
+ if (pageWrap.getModel().getObjId() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getObjId, pageWrap.getModel().getObjId());
+ }
+ if (pageWrap.getModel().getObjType() != null) {
+ queryWrapper.lambda().eq(SmsEmail::getObjType, pageWrap.getModel().getObjType());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(smsEmailMapper.selectPage(page, queryWrapper));
+ }
+
+ @Override
+ public long count(SmsEmail smsEmail) {
+ QueryWrapper<SmsEmail> wrapper = new QueryWrapper<>(smsEmail);
+ return smsEmailMapper.selectCount(wrapper);
+ }
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 8eba3c7..7d1c818 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -1,20 +1,43 @@
package com.doumee.service.business.impl;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.Jwt.JwtPayLoad;
+import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.ShopMapper;
+import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.UsersMapper;
+import com.doumee.dao.business.model.Multifile;
+import com.doumee.dao.business.model.News;
+import com.doumee.dao.business.model.Shop;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Users;
+import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.web.response.AccountResponse;
import com.doumee.service.business.UsersService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.catalina.User;
+import org.apache.commons.lang3.StringUtils;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 鍛樺伐淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +49,10 @@
@Autowired
private UsersMapper usersMapper;
+ @Autowired
+ private ShopMapper shopMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public Long create(Users users) {
@@ -87,123 +114,159 @@
@Override
public PageData<Users> findPage(PageWrap<Users> pageWrap) {
IPage<Users> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Users> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Users> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.leftJoin(Shop.class,Shop::getId,Users::getDepartmentId)
+ .selectAs(Shop::getNamePath,Users::getShopName)
+ .selectAs(Shop::getType,Users::getShopType)
+ .selectAs(Shop::getSecondType,Users::getShopSecType)
+ .selectAll(Users.class);
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Users::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(Users::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Users::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(Users::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Users::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Users::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(Users::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(Users::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(Users::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(Users::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Users::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Users::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(Users::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(Users::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Users::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(Users::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Users::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(Users::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getDepartmentId() != null) {
- queryWrapper.lambda().eq(Users::getDepartmentId, pageWrap.getModel().getDepartmentId());
+ queryWrapper.eq(Users::getDepartmentId, pageWrap.getModel().getDepartmentId());
}
if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(Users::getImgurl, pageWrap.getModel().getImgurl());
+ queryWrapper.eq(Users::getImgurl, pageWrap.getModel().getImgurl());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Users::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(Users::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Users::getName, pageWrap.getModel().getName());
+ queryWrapper.eq(Users::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getBirthday() != null) {
- queryWrapper.lambda().ge(Users::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
- queryWrapper.lambda().le(Users::getBirthday, Utils.Date.getEnd(pageWrap.getModel().getBirthday()));
+ queryWrapper.ge(Users::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
+ queryWrapper.le(Users::getBirthday, Utils.Date.getEnd(pageWrap.getModel().getBirthday()));
}
if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().eq(Users::getPhone, pageWrap.getModel().getPhone());
+ queryWrapper.eq(Users::getPhone, pageWrap.getModel().getPhone());
}
if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().eq(Users::getIdcardNo, pageWrap.getModel().getIdcardNo());
+ queryWrapper.eq(Users::getIdcardNo, pageWrap.getModel().getIdcardNo());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(Users::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(Users::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getOpenid() != null) {
- queryWrapper.lambda().eq(Users::getOpenid, pageWrap.getModel().getOpenid());
+ queryWrapper.eq(Users::getOpenid, pageWrap.getModel().getOpenid());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Users::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(Users::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getIamStatus() != null) {
- queryWrapper.lambda().eq(Users::getIamStatus, pageWrap.getModel().getIamStatus());
+ queryWrapper.eq(Users::getIamStatus, pageWrap.getModel().getIamStatus());
}
if (pageWrap.getModel().getIamDate() != null) {
- queryWrapper.lambda().ge(Users::getIamDate, Utils.Date.getStart(pageWrap.getModel().getIamDate()));
- queryWrapper.lambda().le(Users::getIamDate, Utils.Date.getEnd(pageWrap.getModel().getIamDate()));
+ queryWrapper.ge(Users::getIamDate, Utils.Date.getStart(pageWrap.getModel().getIamDate()));
+ queryWrapper.le(Users::getIamDate, Utils.Date.getEnd(pageWrap.getModel().getIamDate()));
}
if (pageWrap.getModel().getIamId() != null) {
- queryWrapper.lambda().eq(Users::getIamId, pageWrap.getModel().getIamId());
+ queryWrapper.eq(Users::getIamId, pageWrap.getModel().getIamId());
}
if (pageWrap.getModel().getIamUsername() != null) {
- queryWrapper.lambda().eq(Users::getIamUsername, pageWrap.getModel().getIamUsername());
+ queryWrapper.like(Users::getIamUsername, pageWrap.getModel().getIamUsername());
}
if (pageWrap.getModel().getPassword() != null) {
- queryWrapper.lambda().eq(Users::getPassword, pageWrap.getModel().getPassword());
+ queryWrapper.eq(Users::getPassword, pageWrap.getModel().getPassword());
}
if (pageWrap.getModel().getSex() != null) {
- queryWrapper.lambda().eq(Users::getSex, pageWrap.getModel().getSex());
+ queryWrapper.eq(Users::getSex, pageWrap.getModel().getSex());
}
if (pageWrap.getModel().getLastLoginDate() != null) {
- queryWrapper.lambda().ge(Users::getLastLoginDate, Utils.Date.getStart(pageWrap.getModel().getLastLoginDate()));
- queryWrapper.lambda().le(Users::getLastLoginDate, Utils.Date.getEnd(pageWrap.getModel().getLastLoginDate()));
+ queryWrapper.ge(Users::getLastLoginDate, Utils.Date.getStart(pageWrap.getModel().getLastLoginDate()));
+ queryWrapper.le(Users::getLastLoginDate, Utils.Date.getEnd(pageWrap.getModel().getLastLoginDate()));
}
if (pageWrap.getModel().getLoginNum() != null) {
- queryWrapper.lambda().eq(Users::getLoginNum, pageWrap.getModel().getLoginNum());
+ queryWrapper.eq(Users::getLoginNum, pageWrap.getModel().getLoginNum());
}
if (pageWrap.getModel().getLastLoginPlat() != null) {
- queryWrapper.lambda().eq(Users::getLastLoginPlat, pageWrap.getModel().getLastLoginPlat());
+ queryWrapper.eq(Users::getLastLoginPlat, pageWrap.getModel().getLastLoginPlat());
}
if (pageWrap.getModel().getCostomerNum() != null) {
- queryWrapper.lambda().eq(Users::getCostomerNum, pageWrap.getModel().getCostomerNum());
+ queryWrapper.eq(Users::getCostomerNum, pageWrap.getModel().getCostomerNum());
}
if (pageWrap.getModel().getJobDate() != null) {
- queryWrapper.lambda().eq(Users::getJobDate, pageWrap.getModel().getJobDate());
+ queryWrapper.eq(Users::getJobDate, pageWrap.getModel().getJobDate());
}
if (pageWrap.getModel().getSlogans() != null) {
- queryWrapper.lambda().eq(Users::getSlogans, pageWrap.getModel().getSlogans());
+ queryWrapper.eq(Users::getSlogans, pageWrap.getModel().getSlogans());
}
if (pageWrap.getModel().getQrcodeImg() != null) {
- queryWrapper.lambda().eq(Users::getQrcodeImg, pageWrap.getModel().getQrcodeImg());
+ queryWrapper.eq(Users::getQrcodeImg, pageWrap.getModel().getQrcodeImg());
}
if (pageWrap.getModel().getEmail() != null) {
- queryWrapper.lambda().eq(Users::getEmail, pageWrap.getModel().getEmail());
+ queryWrapper.eq(Users::getEmail, pageWrap.getModel().getEmail());
}
if (pageWrap.getModel().getUserTypes() != null) {
- queryWrapper.lambda().eq(Users::getUserTypes, pageWrap.getModel().getUserTypes());
+ queryWrapper.eq(Users::getUserTypes, pageWrap.getModel().getUserTypes());
}
if (pageWrap.getModel().getRoleIds() != null) {
- queryWrapper.lambda().eq(Users::getRoleIds, pageWrap.getModel().getRoleIds());
+ queryWrapper.eq(Users::getRoleIds, pageWrap.getModel().getRoleIds());
}
- if (pageWrap.getModel().getRoleNames() != null) {
- queryWrapper.lambda().eq(Users::getRoleNames, pageWrap.getModel().getRoleNames());
+ if (StringUtils.isNotBlank(pageWrap.getModel().getRoleNames() )) {
+ queryWrapper.eq(Users::getRoleNames, pageWrap.getModel().getRoleNames());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ if (StringUtils.isNotBlank(pageWrap.getModel().getShopName() )) {
+ queryWrapper.eq(Shop::getName, pageWrap.getModel().getShopName());
+ }
+ queryWrapper.eq(pageWrap.getModel().getShopType()!=null,Shop::getType,pageWrap.getModel().getShopType());
+ queryWrapper.eq(pageWrap.getModel().getShopSecType()!=null,Shop::getSecondType,pageWrap.getModel().getShopSecType());
+ if(StringUtils.isNotBlank(pageWrap.getModel().getQueryKeyword())){
+ queryWrapper.and(w ->{
+ w.eq(Users::getName,pageWrap.getModel().getQueryKeyword())
+ .or().eq(Users::getPhone,pageWrap.getModel().getQueryKeyword())
+ .or().eq(Users::getCode,pageWrap.getModel().getQueryKeyword())
+ ;
+ } );
+ }
+ if(pageWrap.getModel().getIamOrgId()!=null){
+ if(pageWrap.getModel().getIncludeChild()!=null &&pageWrap.getModel().getIncludeChild() ){
+ //濡傛灉鍖呭惈涓嬬骇缁勭粐
+ Shop shop = shopMapper.selectOne(new QueryWrapper<Shop>().lambda().eq(Shop::getOrgId,pageWrap.getModel().getIamOrgId()).last("limit 1"));//鏌ヨ缁勭粐淇℃伅
+ queryWrapper.likeRight(Shop::getIdPath,shop.getIdPath());
+ }else{
+ //涓嶅寘鍚笅绾х粍缁�
+ queryWrapper.eq(Shop::getOrgId,pageWrap.getModel().getIamOrgId());
}
}
- return PageData.from(usersMapper.selectPage(page, queryWrapper));
+
+ PageData<Users> pageData = PageData.from(usersMapper.selectJoinPage(page,Users.class, queryWrapper));
+ if(pageData!=null && pageData.getRecords()!=null && pageData.getRecords().size()>0){
+ String path = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH ).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE ).getCode();
+ for(Users f : pageData.getRecords()){
+ if(StringUtils.isNotBlank(f.getImgurl())){
+ f.setImgurlFull(path + f.getImgurl());
+ }
+ if(StringUtils.isNotBlank(f.getQrcodeImg())){
+ f.setQrcodeImgFull(path + f.getQrcodeImg());
+ }
+ }
+
+ }
+ return pageData;
}
@Override
@@ -211,4 +274,86 @@
QueryWrapper<Users> wrapper = new QueryWrapper<>(users);
return usersMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public AccountResponse phoneLogin(String phone,String code){
+ if(StringUtils.isEmpty(phone)||StringUtils.isEmpty(code)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Users users = usersMapper.selectOne(new QueryWrapper<Users>().lambda().eq(Users::getPhone,phone).last("limit 1"));
+ if(Objects.isNull(users)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌璐︽埛淇℃伅");
+ }
+ if(!Constants.equalsInteger(users.getIsdeleted(), Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插垹闄�");
+ }
+ if(!StringUtils.equals(users.getStatus(),Constants.ZERO+"")){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳");
+ }
+ //TODO 楠岃瘉鐭俊淇℃伅
+ if(!StringUtils.equals(code,"123456")){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"楠岃瘉鐮侀敊璇�");
+ }
+ //鍒涘缓token
+ JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
+ String token = JwtTokenUtil.generateToken(payLoad);
+ AccountResponse accountResponse = new AccountResponse();
+ accountResponse.setToken(token);
+ accountResponse.setUsers(users);
+ return accountResponse;
+ }
+
+ @Override
+ public AccountResponse wxLogin(String code){
+ try {
+ //鑾峰彇寰俊鏁忔劅鏁版嵁
+ WxMaJscode2SessionResult session = WxMiniConfig.wxPersonnelService.getUserService().getSessionInfo(code);
+ String openId = session.getOpenid();
+ if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
+ }
+ AccountResponse accountResponse = new AccountResponse();
+ accountResponse.setSessionKey(session.getSessionKey());
+ Users users = usersMapper.selectOne(new QueryWrapper<Users>().lambda().eq(Users::getOpenid,openId).last("limit 1"));
+ if(Objects.isNull(users)){
+ return accountResponse;
+ }
+ if(!Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插垹闄�");
+ }
+ if(!StringUtils.equals(users.getStatus(),Constants.ZERO+"")){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳");
+ }
+ //鍒涘缓token
+ JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
+ String token = JwtTokenUtil.generateToken(payLoad);
+ accountResponse.setToken(token);
+ accountResponse.setUsers(users);
+ return accountResponse;
+ } catch (WxErrorException e) {
+ e.printStackTrace();
+ }
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
+ }
+
+
+ @Override
+ public void bindingOpenid(String code,Long userId){
+ try {
+ //鑾峰彇寰俊鏁忔劅鏁版嵁
+ WxMaJscode2SessionResult session = WxMiniConfig.wxPersonnelService.getUserService().getSessionInfo(code);
+ String openId = session.getOpenid();
+ if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
+ }
+ usersMapper.update(new UpdateWrapper<Users>().lambda().set(Users::getOpenid,null).eq(Users::getOpenid,openId));
+ Users users = usersMapper.selectById(userId);
+ users.setOpenid(openId);
+ users.setEditDate(new Date());
+ usersMapper.updateById(users);
+ } catch (WxErrorException e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/server/service/src/main/resources/mappers/SystemDictDataMapper.xml b/server/service/src/main/resources/mappers/SystemDictDataMapper.xml
index ae3a515..f89c4d7 100644
--- a/server/service/src/main/resources/mappers/SystemDictDataMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemDictDataMapper.xml
@@ -16,7 +16,7 @@
</resultMap>
<select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemDictDataDTO" resultMap="SystemDictDataListVO">
SELECT
- dict_data.`ID`, dict_data.`DICT_ID`, dict_data.`CODE`, dict_data.`LABEL`, dict_data.`SORT`, dict_data.`DISABLED`, dict_data.`CREATE_TIME`, dict_data.`UPDATE_TIME`, dict_data.`CREATE_USER`, dict_data.`UPDATE_USER`,
+ dict_data.*,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
FROM SYSTEM_DICT_DATA dict_data
@@ -31,7 +31,7 @@
</select>
<select id="list" resultType="com.doumee.dao.system.vo.SystemDictDataListVO">
SELECT
- dict_data.`ID`, dict_data.`DICT_ID`, dict_data.`CODE`, dict_data.`LABEL`
+ dict_data.*
FROM SYSTEM_DICT_DATA dict_data
<where>
dict_data.DELETED = 0
diff --git a/server/service/target/classes/META-INF/spring-configuration-metadata.json b/server/service/target/classes/META-INF/spring-configuration-metadata.json
deleted file mode 100644
index 6a04fe9..0000000
--- a/server/service/target/classes/META-INF/spring-configuration-metadata.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "groups": [
- {
- "name": "data-sync",
- "type": "com.doumee.config.DataSyncConfig",
- "sourceType": "com.doumee.config.DataSyncConfig"
- },
- {
- "name": "wx.pay",
- "type": "com.doumee.core.wx.WxPayProperties",
- "sourceType": "com.doumee.core.wx.WxPayProperties"
- }
- ],
- "properties": [
- {
- "name": "data-sync.need-deal-img",
- "type": "java.lang.Boolean",
- "sourceType": "com.doumee.config.DataSyncConfig"
- },
- {
- "name": "data-sync.org-user-data-origin",
- "type": "java.lang.Integer",
- "sourceType": "com.doumee.config.DataSyncConfig"
- },
- {
- "name": "data-sync.visitor-data-origin",
- "type": "java.lang.Integer",
- "sourceType": "com.doumee.config.DataSyncConfig"
- },
- {
- "name": "wx.pay.app-id",
- "type": "java.lang.String",
- "description": "AppID",
- "sourceType": "com.doumee.core.wx.WxPayProperties"
- },
- {
- "name": "wx.pay.app-secret",
- "type": "java.lang.String",
- "description": "AppSecret",
- "sourceType": "com.doumee.core.wx.WxPayProperties"
- },
- {
- "name": "wx.pay.key-path",
- "type": "java.lang.String",
- "description": "鏀粯璇佷功(p12)",
- "sourceType": "com.doumee.core.wx.WxPayProperties"
- },
- {
- "name": "wx.pay.mch-id",
- "type": "java.lang.String",
- "description": "寰俊鍟嗘埛鍙�",
- "sourceType": "com.doumee.core.wx.WxPayProperties"
- },
- {
- "name": "wx.pay.mch-key",
- "type": "java.lang.String",
- "description": "鏀粯API瀵嗛挜",
- "sourceType": "com.doumee.core.wx.WxPayProperties"
- },
- {
- "name": "wx.pay.notify-url",
- "type": "java.lang.String",
- "description": "鏀粯鍥炶皟鍦板潃",
- "sourceType": "com.doumee.core.wx.WxPayProperties"
- }
- ],
- "hints": []
-}
\ No newline at end of file
diff --git a/server/service/target/classes/application-dev.yml b/server/service/target/classes/application-dev.yml
deleted file mode 100644
index 0d33244..0000000
--- a/server/service/target/classes/application-dev.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-spring:
- # 鏁版嵁婧愰厤缃�
- datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/zbom_youjia?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: doumee
- password: rtjgfEr@&0c0m
- driver-class-name: com.mysql.cj.jdbc.Driver
- type: com.alibaba.druid.pool.DruidDataSource
- redis:
- # database: 0
- host: 127.0.0.1
- port: 6379
- password:
- timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
-
-#rocketmq:
-# namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
-# groupId: GID-wakatest
-# topic: waka-test
-# username: 4derRb4Sw5EkqUMI
-# password: v50N97wf4av8Q8I4
-
-knife4j:
- enable: true
- basic:
- enable: true
- username: admin
- password: 111111
-
-debug_model: true
-
-########################鍚屾鏁版嵁妯″紡 ########################
-data-sync:
- org-user-data-origin: 1 #缁勭粐鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
- visitor-data-origin: 1 #璁垮鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
- need-deal-img: true #鏄惁闇�瑕佸鐞嗗浘鐗囨暟鎹�
-
-# Swagger閰嶇疆
-swagger:
- host: 127.0.0.1
- title: ${project.name}鎺ュ彛鏂囨。
- description: ${project.name}鎺ュ彛鏂囨。
- enabled: true
- context-path:
- # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
- redirect-uri: /
-
-
-tencent:
- map:
- remoteHost: https://apis.map.qq.com
- appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
-
-
-
-des_pwd: 123456SDFKDJF
-
diff --git a/server/service/target/classes/application-pro.yml b/server/service/target/classes/application-pro.yml
deleted file mode 100644
index c8a2977..0000000
--- a/server/service/target/classes/application-pro.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-spring:
- # 鏁版嵁婧愰厤缃�
- datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/zbom_youjia?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: doumee
- password: rtjgfEr@&0c0m
- driver-class-name: com.mysql.cj.jdbc.Driver
- type: com.alibaba.druid.pool.DruidDataSource
- redis:
- # database: 0
- host: 127.0.0.1
- port: 6379
- password:
- timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
-
-knife4j:
- enable: true
- basic:
- enable: true
- username: admin
- password: 111111
-
-debug_model: false
-
-########################鍚屾鏁版嵁妯″紡 ########################
-data-sync:
- org-user-data-origin: 1 #缁勭粐鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
- visitor-data-origin: 1 #璁垮鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
- need-deal-img: true #鏄惁闇�瑕佸鐞嗗浘鐗囨暟鎹�
-
-# Swagger閰嶇疆
-swagger:
- host: 127.0.0.1
- title: ${project.name}鎺ュ彛鏂囨。
- description: ${project.name}鎺ュ彛鏂囨。
- enabled: true
- context-path:
- # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
- redirect-uri: /
-
-tencent:
- map:
- remoteHost: https://apis.map.qq.com
- appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
-
-des_pwd: 123456SDFKDJF
-
diff --git a/server/service/target/classes/application-test.yml b/server/service/target/classes/application-test.yml
deleted file mode 100644
index 2fc7284..0000000
--- a/server/service/target/classes/application-test.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-spring:
- # 鏁版嵁婧愰厤缃�
- datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/zbom_youjia?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: doumee
- password: rtjgfEr@&0c0m
- driver-class-name: com.mysql.cj.jdbc.Driver
- type: com.alibaba.druid.pool.DruidDataSource
- redis:
- # database: 0
- host: 127.0.0.1
- port: 6379
- password:
- timeout: 5000 # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- jackson:
- time-zone: GMT+8
- date-format: yyyy-MM-dd HH:mm:ss
-
-#rocketmq:
-# namesrvAddr: rmq-cn-pe335rcnn06.cn-shanghai.rmq.aliyuncs.com:8080
-# groupId: GID-wakatest
-# topic: waka-test
-# username: 4derRb4Sw5EkqUMI
-# password: v50N97wf4av8Q8I4
-
-knife4j:
- enable: true
- basic:
- enable: true
- username: admin
- password: 111111
-
-debug_model: true
-
-########################鍚屾鏁版嵁妯″紡 ########################
-data-sync:
- org-user-data-origin: 1 #缁勭粐鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
- visitor-data-origin: 1 #璁垮鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺
- need-deal-img: true #鏄惁闇�瑕佸鐞嗗浘鐗囨暟鎹�
-
-# Swagger閰嶇疆
-swagger:
- host: 127.0.0.1
- title: ${project.name}鎺ュ彛鏂囨。
- description: ${project.name}鎺ュ彛鏂囨。
- enabled: true
- context-path:
- # 绂佺敤swagger鏃剁殑閲嶅畾鍚戝湴鍧�
- redirect-uri: /
-
-
-tencent:
- map:
- remoteHost: https://apis.map.qq.com
- appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
-
-
-
-des_pwd: 123456SDFKDJF
-
diff --git a/server/service/target/classes/banner.txt b/server/service/target/classes/banner.txt
deleted file mode 100644
index e6519fd..0000000
--- a/server/service/target/classes/banner.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-${AnsiColor.BLUE}
-================================================================================
-
- 娆㈣繋浣跨敤璞嗙背妗嗘灦锛堝崟搴旂敤鐗堬級
- Version :: 1.0
-
- 鈻堚枅鈻堚枅鈻堚枅鈻堚枅 鈻堚枅 鈻堚枅
- 鈻戔枅鈻堚枒鈻戔枒鈻戔枒 鈻堚枅 鈻戔枅鈻堚枒鈻堚枅 鈻堚枅 鈻堚枅
- 鈻戔枅鈻� 鈻戔枒鈻堚枅 鈻戔枅鈻� 鈻戔枒鈻堚枅 鈻堚枅 鈻戔枒鈻堚枅
- 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枒鈻堚枅鈻堚枅 鈻戔枒鈻堚枅
- 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枒鈻堚枅 鈻戔枒鈻堚枅
- 鈻戔枅鈻� 鈻堚枅 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻�
- 鈻戔枅鈻堚枅鈻堚枅鈻堚枅鈻堚枒 鈻戔枅鈻� 鈻戔枅鈻� 鈻戔枅鈻�
- 鈻戔枒鈻戔枒鈻戔枒鈻戔枒 鈻戔枒 鈻戔枒 鈻戔枒
-
- 鍚姩绔彛: ${server.port} 鍚姩鐜: ${project.env} 鏃ュ織绛夌骇: ${logback.level} 鍚敤Swagger: ${swagger.enabled}
-
-================================================================================
-
diff --git a/server/service/target/classes/com/doumee/biz/system/SystemDataPermissionBiz.class b/server/service/target/classes/com/doumee/biz/system/SystemDataPermissionBiz.class
deleted file mode 100644
index 2175fee..0000000
--- a/server/service/target/classes/com/doumee/biz/system/SystemDataPermissionBiz.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/SystemDepartmentBiz.class b/server/service/target/classes/com/doumee/biz/system/SystemDepartmentBiz.class
deleted file mode 100644
index aa2976f..0000000
--- a/server/service/target/classes/com/doumee/biz/system/SystemDepartmentBiz.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/SystemDictBiz.class b/server/service/target/classes/com/doumee/biz/system/SystemDictBiz.class
deleted file mode 100644
index 1068263..0000000
--- a/server/service/target/classes/com/doumee/biz/system/SystemDictBiz.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/SystemDictDataBiz.class b/server/service/target/classes/com/doumee/biz/system/SystemDictDataBiz.class
deleted file mode 100644
index cf6a8e7..0000000
--- a/server/service/target/classes/com/doumee/biz/system/SystemDictDataBiz.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/SystemMenuBiz.class b/server/service/target/classes/com/doumee/biz/system/SystemMenuBiz.class
deleted file mode 100644
index f7df264..0000000
--- a/server/service/target/classes/com/doumee/biz/system/SystemMenuBiz.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/SystemPermissionBiz.class b/server/service/target/classes/com/doumee/biz/system/SystemPermissionBiz.class
deleted file mode 100644
index 32d73f0..0000000
--- a/server/service/target/classes/com/doumee/biz/system/SystemPermissionBiz.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/SystemPositionBiz.class b/server/service/target/classes/com/doumee/biz/system/SystemPositionBiz.class
deleted file mode 100644
index a6046ff..0000000
--- a/server/service/target/classes/com/doumee/biz/system/SystemPositionBiz.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/SystemRoleBiz.class b/server/service/target/classes/com/doumee/biz/system/SystemRoleBiz.class
deleted file mode 100644
index f9e2b2e..0000000
--- a/server/service/target/classes/com/doumee/biz/system/SystemRoleBiz.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/SystemUserBiz.class b/server/service/target/classes/com/doumee/biz/system/SystemUserBiz.class
deleted file mode 100644
index fcbfdd4..0000000
--- a/server/service/target/classes/com/doumee/biz/system/SystemUserBiz.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/impl/SystemDataPermissionBizImpl.class b/server/service/target/classes/com/doumee/biz/system/impl/SystemDataPermissionBizImpl.class
deleted file mode 100644
index dd87df2..0000000
--- a/server/service/target/classes/com/doumee/biz/system/impl/SystemDataPermissionBizImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/impl/SystemDepartmentBizImpl.class b/server/service/target/classes/com/doumee/biz/system/impl/SystemDepartmentBizImpl.class
deleted file mode 100644
index 5aeae1d..0000000
--- a/server/service/target/classes/com/doumee/biz/system/impl/SystemDepartmentBizImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/impl/SystemDictBizImpl.class b/server/service/target/classes/com/doumee/biz/system/impl/SystemDictBizImpl.class
deleted file mode 100644
index a1c05a9..0000000
--- a/server/service/target/classes/com/doumee/biz/system/impl/SystemDictBizImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/impl/SystemDictDataBizImpl.class b/server/service/target/classes/com/doumee/biz/system/impl/SystemDictDataBizImpl.class
deleted file mode 100644
index c1d214d..0000000
--- a/server/service/target/classes/com/doumee/biz/system/impl/SystemDictDataBizImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/impl/SystemMenuBizImpl.class b/server/service/target/classes/com/doumee/biz/system/impl/SystemMenuBizImpl.class
deleted file mode 100644
index f697ffd..0000000
--- a/server/service/target/classes/com/doumee/biz/system/impl/SystemMenuBizImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/impl/SystemPermissionBizImpl.class b/server/service/target/classes/com/doumee/biz/system/impl/SystemPermissionBizImpl.class
deleted file mode 100644
index 586324c..0000000
--- a/server/service/target/classes/com/doumee/biz/system/impl/SystemPermissionBizImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/impl/SystemPositionBizImpl.class b/server/service/target/classes/com/doumee/biz/system/impl/SystemPositionBizImpl.class
deleted file mode 100644
index 29eeed4..0000000
--- a/server/service/target/classes/com/doumee/biz/system/impl/SystemPositionBizImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/impl/SystemRoleBizImpl.class b/server/service/target/classes/com/doumee/biz/system/impl/SystemRoleBizImpl.class
deleted file mode 100644
index 2dba65d..0000000
--- a/server/service/target/classes/com/doumee/biz/system/impl/SystemRoleBizImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/biz/system/impl/SystemUserBizImpl.class b/server/service/target/classes/com/doumee/biz/system/impl/SystemUserBizImpl.class
deleted file mode 100644
index 4aa8c6c..0000000
--- a/server/service/target/classes/com/doumee/biz/system/impl/SystemUserBizImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/DataSyncConfig$origin.class b/server/service/target/classes/com/doumee/config/DataSyncConfig$origin.class
deleted file mode 100644
index ca671a6..0000000
--- a/server/service/target/classes/com/doumee/config/DataSyncConfig$origin.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/DataSyncConfig.class b/server/service/target/classes/com/doumee/config/DataSyncConfig.class
deleted file mode 100644
index 94543a7..0000000
--- a/server/service/target/classes/com/doumee/config/DataSyncConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/Jwt/JwtPayLoad.class b/server/service/target/classes/com/doumee/config/Jwt/JwtPayLoad.class
deleted file mode 100644
index d9894ab..0000000
--- a/server/service/target/classes/com/doumee/config/Jwt/JwtPayLoad.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/Jwt/JwtTokenUtil.class b/server/service/target/classes/com/doumee/config/Jwt/JwtTokenUtil.class
deleted file mode 100644
index 9f58e74..0000000
--- a/server/service/target/classes/com/doumee/config/Jwt/JwtTokenUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/Jwt/WebMvcConfig$1.class b/server/service/target/classes/com/doumee/config/Jwt/WebMvcConfig$1.class
deleted file mode 100644
index 05498a2..0000000
--- a/server/service/target/classes/com/doumee/config/Jwt/WebMvcConfig$1.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/Jwt/WebMvcConfig.class b/server/service/target/classes/com/doumee/config/Jwt/WebMvcConfig.class
deleted file mode 100644
index 78e54e3..0000000
--- a/server/service/target/classes/com/doumee/config/Jwt/WebMvcConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/SpringContextUtil.class b/server/service/target/classes/com/doumee/config/SpringContextUtil.class
deleted file mode 100644
index 519b5f8..0000000
--- a/server/service/target/classes/com/doumee/config/SpringContextUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/annotation/ErpLoginRequired.class b/server/service/target/classes/com/doumee/config/annotation/ErpLoginRequired.class
deleted file mode 100644
index 69d7509..0000000
--- a/server/service/target/classes/com/doumee/config/annotation/ErpLoginRequired.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/annotation/LoginRequired.class b/server/service/target/classes/com/doumee/config/annotation/LoginRequired.class
deleted file mode 100644
index 6df9205..0000000
--- a/server/service/target/classes/com/doumee/config/annotation/LoginRequired.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/handler/GlobalExceptionHandler.class b/server/service/target/classes/com/doumee/config/handler/GlobalExceptionHandler.class
deleted file mode 100644
index e1f54bd..0000000
--- a/server/service/target/classes/com/doumee/config/handler/GlobalExceptionHandler.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/mybatis/EasySqlInjector.class b/server/service/target/classes/com/doumee/config/mybatis/EasySqlInjector.class
deleted file mode 100644
index 8190361..0000000
--- a/server/service/target/classes/com/doumee/config/mybatis/EasySqlInjector.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/mybatis/JSONObjectHandler.class b/server/service/target/classes/com/doumee/config/mybatis/JSONObjectHandler.class
deleted file mode 100644
index 66e915e..0000000
--- a/server/service/target/classes/com/doumee/config/mybatis/JSONObjectHandler.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/mybatis/MyBatisInterceptor.class b/server/service/target/classes/com/doumee/config/mybatis/MyBatisInterceptor.class
deleted file mode 100644
index 6ef1764..0000000
--- a/server/service/target/classes/com/doumee/config/mybatis/MyBatisInterceptor.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/mybatis/MyBatisPlusConfig.class b/server/service/target/classes/com/doumee/config/mybatis/MyBatisPlusConfig.class
deleted file mode 100644
index ca4ee17..0000000
--- a/server/service/target/classes/com/doumee/config/mybatis/MyBatisPlusConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/config/mybatis/SpringUtils.class b/server/service/target/classes/com/doumee/config/mybatis/SpringUtils.class
deleted file mode 100644
index 2bbcbb1..0000000
--- a/server/service/target/classes/com/doumee/config/mybatis/SpringUtils.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/excel/ExcelColumn.class b/server/service/target/classes/com/doumee/core/annotation/excel/ExcelColumn.class
deleted file mode 100644
index 16f7a2c..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/excel/ExcelColumn.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/excel/ExcelDataHandlerAdapter.class b/server/service/target/classes/com/doumee/core/annotation/excel/ExcelDataHandlerAdapter.class
deleted file mode 100644
index 475dd4e..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/excel/ExcelDataHandlerAdapter.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/excel/ExcelExporter$ColumnInfo.class b/server/service/target/classes/com/doumee/core/annotation/excel/ExcelExporter$ColumnInfo.class
deleted file mode 100644
index a4401c1..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/excel/ExcelExporter$ColumnInfo.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/excel/ExcelExporter.class b/server/service/target/classes/com/doumee/core/annotation/excel/ExcelExporter.class
deleted file mode 100644
index 9685cce..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/excel/ExcelExporter.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/excel/ExcelImporter.class b/server/service/target/classes/com/doumee/core/annotation/excel/ExcelImporter.class
deleted file mode 100644
index 0827ba3..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/excel/ExcelImporter.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/excel/Reflections.class b/server/service/target/classes/com/doumee/core/annotation/excel/Reflections.class
deleted file mode 100644
index be4629e..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/excel/Reflections.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeat.class b/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeat.class
deleted file mode 100644
index 9eed294..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeat.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatAdapter$MassiveUnit.class b/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatAdapter$MassiveUnit.class
deleted file mode 100644
index 611f071..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatAdapter$MassiveUnit.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatAdapter.class b/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatAdapter.class
deleted file mode 100644
index 705fbea..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatAdapter.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.class b/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.class
deleted file mode 100644
index 466c07a..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatInterceptor.class b/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatInterceptor.class
deleted file mode 100644
index c18ba61..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatInterceptor.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatInterceptorConfig.class b/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatInterceptorConfig.class
deleted file mode 100644
index 247714a..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/pr/PreventRepeatInterceptorConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/trace/Trace.class b/server/service/target/classes/com/doumee/core/annotation/trace/Trace.class
deleted file mode 100644
index 8ec787e..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/trace/Trace.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/trace/TraceInterceptor.class b/server/service/target/classes/com/doumee/core/annotation/trace/TraceInterceptor.class
deleted file mode 100644
index 6c2e956..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/trace/TraceInterceptor.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/trace/TraceInterceptorConfig.class b/server/service/target/classes/com/doumee/core/annotation/trace/TraceInterceptorConfig.class
deleted file mode 100644
index a5245da..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/trace/TraceInterceptorConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/trace/TraceStatus.class b/server/service/target/classes/com/doumee/core/annotation/trace/TraceStatus.class
deleted file mode 100644
index 1830063..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/trace/TraceStatus.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/annotation/trace/TraceType.class b/server/service/target/classes/com/doumee/core/annotation/trace/TraceType.class
deleted file mode 100644
index 207dfe6..0000000
--- a/server/service/target/classes/com/doumee/core/annotation/trace/TraceType.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/aware/DataPermissionAware.class b/server/service/target/classes/com/doumee/core/aware/DataPermissionAware.class
deleted file mode 100644
index 14156ab..0000000
--- a/server/service/target/classes/com/doumee/core/aware/DataPermissionAware.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/aware/DataPermissionMapping.class b/server/service/target/classes/com/doumee/core/aware/DataPermissionMapping.class
deleted file mode 100644
index f1f5cac..0000000
--- a/server/service/target/classes/com/doumee/core/aware/DataPermissionMapping.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/aware/DefaultDataPermissionAware.class b/server/service/target/classes/com/doumee/core/aware/DefaultDataPermissionAware.class
deleted file mode 100644
index 480c65b..0000000
--- a/server/service/target/classes/com/doumee/core/aware/DefaultDataPermissionAware.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/cache/LocalCache$Value.class b/server/service/target/classes/com/doumee/core/cache/LocalCache$Value.class
deleted file mode 100644
index b71a51b..0000000
--- a/server/service/target/classes/com/doumee/core/cache/LocalCache$Value.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/cache/LocalCache.class b/server/service/target/classes/com/doumee/core/cache/LocalCache.class
deleted file mode 100644
index 9cf773e..0000000
--- a/server/service/target/classes/com/doumee/core/cache/LocalCache.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Module$1.class b/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Module$1.class
deleted file mode 100644
index fae46e8..0000000
--- a/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Module$1.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Module.class b/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Module.class
deleted file mode 100644
index 467e71a..0000000
--- a/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Module.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Type$1.class b/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Type$1.class
deleted file mode 100644
index 3a2bb68..0000000
--- a/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Type$1.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Type.class b/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Type.class
deleted file mode 100644
index 8f2a523..0000000
--- a/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants$Type.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants.class b/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants.class
deleted file mode 100644
index 165ef13..0000000
--- a/server/service/target/classes/com/doumee/core/constants/DataPermissionConstants.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/ExceptionLevel.class b/server/service/target/classes/com/doumee/core/constants/ExceptionLevel.class
deleted file mode 100644
index 7ff8838..0000000
--- a/server/service/target/classes/com/doumee/core/constants/ExceptionLevel.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/OperaType$Create.class b/server/service/target/classes/com/doumee/core/constants/OperaType$Create.class
deleted file mode 100644
index 7f27bb8..0000000
--- a/server/service/target/classes/com/doumee/core/constants/OperaType$Create.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/OperaType$Update.class b/server/service/target/classes/com/doumee/core/constants/OperaType$Update.class
deleted file mode 100644
index e7c55a2..0000000
--- a/server/service/target/classes/com/doumee/core/constants/OperaType$Update.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/OperaType$UpdateStatus.class b/server/service/target/classes/com/doumee/core/constants/OperaType$UpdateStatus.class
deleted file mode 100644
index cbe8c62..0000000
--- a/server/service/target/classes/com/doumee/core/constants/OperaType$UpdateStatus.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/OperaType.class b/server/service/target/classes/com/doumee/core/constants/OperaType.class
deleted file mode 100644
index bd75baa..0000000
--- a/server/service/target/classes/com/doumee/core/constants/OperaType.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/constants/ResponseStatus.class b/server/service/target/classes/com/doumee/core/constants/ResponseStatus.class
deleted file mode 100644
index 583cbc3..0000000
--- a/server/service/target/classes/com/doumee/core/constants/ResponseStatus.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/ErpConstants.class b/server/service/target/classes/com/doumee/core/erp/ErpConstants.class
deleted file mode 100644
index ba08347..0000000
--- a/server/service/target/classes/com/doumee/core/erp/ErpConstants.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/ErpTool$1.class b/server/service/target/classes/com/doumee/core/erp/ErpTool$1.class
deleted file mode 100644
index 424a1ad..0000000
--- a/server/service/target/classes/com/doumee/core/erp/ErpTool$1.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/ErpTool$2.class b/server/service/target/classes/com/doumee/core/erp/ErpTool$2.class
deleted file mode 100644
index 74d1c70..0000000
--- a/server/service/target/classes/com/doumee/core/erp/ErpTool$2.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/ErpTool$3.class b/server/service/target/classes/com/doumee/core/erp/ErpTool$3.class
deleted file mode 100644
index 84ada34..0000000
--- a/server/service/target/classes/com/doumee/core/erp/ErpTool$3.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/ErpTool$4.class b/server/service/target/classes/com/doumee/core/erp/ErpTool$4.class
deleted file mode 100644
index 06ca62f..0000000
--- a/server/service/target/classes/com/doumee/core/erp/ErpTool$4.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/ErpTool.class b/server/service/target/classes/com/doumee/core/erp/ErpTool.class
deleted file mode 100644
index 5def6b3..0000000
--- a/server/service/target/classes/com/doumee/core/erp/ErpTool.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.class
deleted file mode 100644
index 84c64e2..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/ApproveNoticeRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.class
deleted file mode 100644
index 750c368..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/CarEventListRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/CarEventListRequest.class
deleted file mode 100644
index 493a724..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/CarEventListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.class
deleted file mode 100644
index 8d531df..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/OrgUpdateRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/OrgUpdateRequest.class
deleted file mode 100644
index 229dc8a..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/OrgUpdateRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/ParkListRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/ParkListRequest.class
deleted file mode 100644
index cfcc737..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/ParkListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/RoleListRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/RoleListRequest.class
deleted file mode 100644
index afd9a0a..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/RoleListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/TokenRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/TokenRequest.class
deleted file mode 100644
index 06eabcb..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/TokenRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/UserAuthorRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/UserAuthorRequest.class
deleted file mode 100644
index c34fba2..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/UserAuthorRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.class
deleted file mode 100644
index 771e21c..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/VisitListRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/VisitListRequest.class
deleted file mode 100644
index bf0be6e..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/VisitListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.class
deleted file mode 100644
index 00836cc..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/ApproveAddRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/OrgListRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/OrgListRequest.class
deleted file mode 100644
index c7aef1b..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/OrgListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/UserFailRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/UserFailRequest.class
deleted file mode 100644
index 638898a..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/UserFailRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/UserInfoRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/UserInfoRequest.class
deleted file mode 100644
index d345ff9..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/UserInfoRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.class
deleted file mode 100644
index cc22acc..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/request/erp/UserListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/AccessTokenResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/AccessTokenResponse.class
deleted file mode 100644
index 091dd03..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/AccessTokenResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/CarEventListResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/CarEventListResponse.class
deleted file mode 100644
index 8ac7ff0..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/CarEventListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/DeviceListResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/DeviceListResponse.class
deleted file mode 100644
index 093c6a1..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/DeviceListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/DoorEventListResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/DoorEventListResponse.class
deleted file mode 100644
index 250c777..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/DoorEventListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/ParkListResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/ParkListResponse.class
deleted file mode 100644
index 0e884e4..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/ParkListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/RoleListResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/RoleListResponse.class
deleted file mode 100644
index 1340f72..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/RoleListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/VisitEventListResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/VisitEventListResponse.class
deleted file mode 100644
index f987687..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/VisitEventListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ApproveInfoResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ApproveInfoResponse.class
deleted file mode 100644
index d0501d5..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ApproveInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ERPApiResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ERPApiResponse.class
deleted file mode 100644
index d337e8e..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ERPApiResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ErpOrgListResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ErpOrgListResponse.class
deleted file mode 100644
index b15386c..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ErpOrgListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ErpUserListResponse.class b/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ErpUserListResponse.class
deleted file mode 100644
index 79d2918..0000000
--- a/server/service/target/classes/com/doumee/core/erp/model/openapi/response/erp/ErpUserListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/exception/BusinessException.class b/server/service/target/classes/com/doumee/core/exception/BusinessException.class
deleted file mode 100644
index 8aa3549..0000000
--- a/server/service/target/classes/com/doumee/core/exception/BusinessException.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/exception/UnSafeSessionException.class b/server/service/target/classes/com/doumee/core/exception/UnSafeSessionException.class
deleted file mode 100644
index bb148bd..0000000
--- a/server/service/target/classes/com/doumee/core/exception/UnSafeSessionException.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$1.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$1.class
deleted file mode 100644
index d05f031..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$1.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$10.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$10.class
deleted file mode 100644
index a5c9fd0..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$10.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$11.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$11.class
deleted file mode 100644
index abb3fae..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$11.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$12.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$12.class
deleted file mode 100644
index 423f571..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$12.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$13.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$13.class
deleted file mode 100644
index bd91f4e..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$13.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$14.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$14.class
deleted file mode 100644
index eaf46bc..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$14.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$15.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$15.class
deleted file mode 100644
index 1aff636..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$15.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$16.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$16.class
deleted file mode 100644
index 5c75042..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$16.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$17.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$17.class
deleted file mode 100644
index 38b1aed..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$17.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$18.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$18.class
deleted file mode 100644
index d729c49..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$18.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$19.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$19.class
deleted file mode 100644
index a5bef06..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$19.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$2.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$2.class
deleted file mode 100644
index 7f38172..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$2.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$20.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$20.class
deleted file mode 100644
index b4fd9b9..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$20.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$21.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$21.class
deleted file mode 100644
index 7923af4..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$21.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$22.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$22.class
deleted file mode 100644
index 9772c46..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$22.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$23.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$23.class
deleted file mode 100644
index 0703ccb..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$23.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$24.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$24.class
deleted file mode 100644
index c204df8..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$24.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$25.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$25.class
deleted file mode 100644
index 402eafc..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$25.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$26.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$26.class
deleted file mode 100644
index 0f5e3e0..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$26.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$27.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$27.class
deleted file mode 100644
index 2fd47d9..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$27.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$28.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$28.class
deleted file mode 100644
index e794725..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$28.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$29.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$29.class
deleted file mode 100644
index cc833fb..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$29.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$3.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$3.class
deleted file mode 100644
index a4d0c6e..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$3.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$30.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$30.class
deleted file mode 100644
index da30fd4..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$30.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$31.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$31.class
deleted file mode 100644
index 92198f9..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$31.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$32.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$32.class
deleted file mode 100644
index ee09158..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$32.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$33.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$33.class
deleted file mode 100644
index 55e346a..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$33.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$34.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$34.class
deleted file mode 100644
index 23409c0..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$34.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$35.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$35.class
deleted file mode 100644
index 210cc3c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$35.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$4.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$4.class
deleted file mode 100644
index 1655ebf..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$4.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$5.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$5.class
deleted file mode 100644
index 42674a1..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$5.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$6.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$6.class
deleted file mode 100644
index b9f7b5e..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$6.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$7.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$7.class
deleted file mode 100644
index 92cba37..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$7.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$8.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$8.class
deleted file mode 100644
index b5ac78c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$8.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil$9.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil$9.class
deleted file mode 100644
index 6780166..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil$9.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/HKUtil.class b/server/service/target/classes/com/doumee/core/haikang/HKUtil.class
deleted file mode 100644
index c773547..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/HKUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$CARD_TYPE.class b/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$CARD_TYPE.class
deleted file mode 100644
index dd491d9..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$CARD_TYPE.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$CardStatus.class b/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$CardStatus.class
deleted file mode 100644
index f14aafc..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$CardStatus.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$CertificateType.class b/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$CertificateType.class
deleted file mode 100644
index cfc6adb..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$CertificateType.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$Colors.class b/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$Colors.class
deleted file mode 100644
index 5305075..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$Colors.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$EventTypes.class b/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$EventTypes.class
deleted file mode 100644
index c5c2d22..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$EventTypes.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$InterfacePath.class b/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$InterfacePath.class
deleted file mode 100644
index 001bafb..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$InterfacePath.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$OPERA_TYPE.class b/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$OPERA_TYPE.class
deleted file mode 100644
index 5231ff7..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$OPERA_TYPE.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$ReturnCode.class b/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$ReturnCode.class
deleted file mode 100644
index 0a1ca5f..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$ReturnCode.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$TASK_TYPE.class b/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$TASK_TYPE.class
deleted file mode 100644
index 954eaa2..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants$TASK_TYPE.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants.class b/server/service/target/classes/com/doumee/core/haikang/model/HKConstants.class
deleted file mode 100644
index c124606..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKConstants.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKResponseCode$ReturnCode.class b/server/service/target/classes/com/doumee/core/haikang/model/HKResponseCode$ReturnCode.class
deleted file mode 100644
index 42d5e89..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKResponseCode$ReturnCode.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKResponseCode.class b/server/service/target/classes/com/doumee/core/haikang/model/HKResponseCode.class
deleted file mode 100644
index 6f556c0..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKResponseCode.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKTools$1.class b/server/service/target/classes/com/doumee/core/haikang/model/HKTools$1.class
deleted file mode 100644
index 9383add..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKTools$1.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/HKTools.class b/server/service/target/classes/com/doumee/core/haikang/model/HKTools.class
deleted file mode 100644
index 5ce6c6e..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/HKTools.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/BaseListPageResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/BaseListPageResponse.class
deleted file mode 100644
index a09fe0d..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/BaseListPageResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/BaseRequst.class b/server/service/target/classes/com/doumee/core/haikang/model/param/BaseRequst.class
deleted file mode 100644
index e9e2c59..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/BaseRequst.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/BaseResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/BaseResponse.class
deleted file mode 100644
index 65943e7..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/BaseResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/AcsDeviceListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/AcsDeviceListRequest.class
deleted file mode 100644
index 8d0bbc7..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/AcsDeviceListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/AcsDeviceStatusListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/AcsDeviceStatusListRequest.class
deleted file mode 100644
index c0acaea..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/AcsDeviceStatusListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/AppointmentListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/AppointmentListRequest.class
deleted file mode 100644
index 305c032..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/AppointmentListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/AuthItemListPersonRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/AuthItemListPersonRequest.class
deleted file mode 100644
index ca2805a..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/AuthItemListPersonRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/AuthItemListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/AuthItemListRequest.class
deleted file mode 100644
index 04d0618..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/AuthItemListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CarChargeAddRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/CarChargeAddRequest.class
deleted file mode 100644
index d810c53..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CarChargeAddRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CarChargeDelRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/CarChargeDelRequest.class
deleted file mode 100644
index 93cae6a..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CarChargeDelRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CarPictureRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/CarPictureRequest.class
deleted file mode 100644
index 6e6508c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CarPictureRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardBingdingRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardBingdingRequest.class
deleted file mode 100644
index 5fe2c6c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardBingdingRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardDeletionRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardDeletionRequest.class
deleted file mode 100644
index 9174455..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardDeletionRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardInfoRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardInfoRequest.class
deleted file mode 100644
index 97a2de4..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardInfoRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardLossRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardLossRequest.class
deleted file mode 100644
index 740e29b..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/CardLossRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/DevicePictureRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/DevicePictureRequest.class
deleted file mode 100644
index 79b5aa7..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/DevicePictureRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/DoorsListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/DoorsListRequest.class
deleted file mode 100644
index b320f60..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/DoorsListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/EntranceListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/EntranceListRequest.class
deleted file mode 100644
index f588e18..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/EntranceListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/EventSubRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/EventSubRequest.class
deleted file mode 100644
index 59d2cf5..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/EventSubRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/FaceAddRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/FaceAddRequest.class
deleted file mode 100644
index 4032645..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/FaceAddRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/FaceEditRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/FaceEditRequest.class
deleted file mode 100644
index 7787bb5..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/FaceEditRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/FacePictureCheckRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/FacePictureCheckRequest.class
deleted file mode 100644
index 0100c2f..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/FacePictureCheckRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/FacePictureRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/FacePictureRequest.class
deleted file mode 100644
index ccb4a04..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/FacePictureRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/OrgAddRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/OrgAddRequest.class
deleted file mode 100644
index 6931cea..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/OrgAddRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/OrgDelRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/OrgDelRequest.class
deleted file mode 100644
index ec89b30..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/OrgDelRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/OrgEditRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/OrgEditRequest.class
deleted file mode 100644
index 04aa048..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/OrgEditRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkCrossRecordListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkCrossRecordListRequest.class
deleted file mode 100644
index 54e22a2..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkCrossRecordListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkListRequest.class
deleted file mode 100644
index 3af6310..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.class
deleted file mode 100644
index 407d8d6..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkReservationDelRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkReservationDelRequest.class
deleted file mode 100644
index 4c8c011..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/ParkReservationDelRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/PrivilegeGroupRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/PrivilegeGroupRequest.class
deleted file mode 100644
index dfbb0a4..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/PrivilegeGroupRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/SortRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/SortRequest.class
deleted file mode 100644
index cb5d8e1..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/SortRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskAdditionRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskAdditionRequest.class
deleted file mode 100644
index 5981b00..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskAdditionRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionCardRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionCardRequest.class
deleted file mode 100644
index 963471f..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionCardRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionFaceRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionFaceRequest.class
deleted file mode 100644
index 933c739..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionFaceRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionPersonRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionPersonRequest.class
deleted file mode 100644
index 036f14e..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionPersonRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionRequest.class
deleted file mode 100644
index 8760c13..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionResourceRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionResourceRequest.class
deleted file mode 100644
index 991a1a8..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskDataAdditionResourceRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskPersonDetailRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskPersonDetailRequest.class
deleted file mode 100644
index 0dc4e8d..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskPersonDetailRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskProgressRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskProgressRequest.class
deleted file mode 100644
index 03089ca..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TaskProgressRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TempCarInRecordListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TempCarInRecordListRequest.class
deleted file mode 100644
index e7e6c4b..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TempCarInRecordListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TimeRangeListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TimeRangeListRequest.class
deleted file mode 100644
index d6746a3..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TimeRangeListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TimeRangeRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/TimeRangeRequest.class
deleted file mode 100644
index 12d5ff3..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/TimeRangeRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserAddFaceRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserAddFaceRequest.class
deleted file mode 100644
index 165d1d8..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserAddFaceRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserAddRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserAddRequest.class
deleted file mode 100644
index 0da8332..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserAddRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserByParamListRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserByParamListRequest.class
deleted file mode 100644
index 5f3dde5..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserByParamListRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserDelRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserDelRequest.class
deleted file mode 100644
index 7608dc0..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/UserDelRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentCancelRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentCancelRequest.class
deleted file mode 100644
index fb52487..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentCancelRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentMDJRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentMDJRequest.class
deleted file mode 100644
index 56ef046..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentMDJRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentOutRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentOutRequest.class
deleted file mode 100644
index 7df9ad5..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentOutRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentPermissonRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentPermissonRequest.class
deleted file mode 100644
index 612fe88..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentPermissonRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentRequest.class
deleted file mode 100644
index d8082e8..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentVistorRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentVistorRequest.class
deleted file mode 100644
index d08ec08..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitAppointmentVistorRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitPictureRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitPictureRequest.class
deleted file mode 100644
index 53807e6..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitPictureRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitingInfoRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitingInfoRequest.class
deleted file mode 100644
index 1e99b37..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/VisitingInfoRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventAcsInfoRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventAcsInfoRequest.class
deleted file mode 100644
index f24e8ea..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventAcsInfoRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventAcsParamRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventAcsParamRequest.class
deleted file mode 100644
index f1a993c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventAcsParamRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventAcsRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventAcsRequest.class
deleted file mode 100644
index ee0ae55..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventAcsRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventDeviceDataRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventDeviceDataRequest.class
deleted file mode 100644
index 921bc57..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/EventDeviceDataRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/ExtEventCustomerNumInfo.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/ExtEventCustomerNumInfo.class
deleted file mode 100644
index a1da964..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/ExtEventCustomerNumInfo.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/ExtEventIdentityCardInfo.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/ExtEventIdentityCardInfo.class
deleted file mode 100644
index 2960ef1..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/acs/ExtEventIdentityCardInfo.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkDataRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkDataRequest.class
deleted file mode 100644
index b3b14a6..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkDataRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkInResultRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkInResultRequest.class
deleted file mode 100644
index 2823d81..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkInResultRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkInfoRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkInfoRequest.class
deleted file mode 100644
index 0445de8..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkInfoRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkParamRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkParamRequest.class
deleted file mode 100644
index 72dfc0c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkParamRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkPicRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkPicRequest.class
deleted file mode 100644
index fc9ac38..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkPicRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkRequest.class
deleted file mode 100644
index f8d0528..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkRlsRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkRlsRequest.class
deleted file mode 100644
index 039dd0f..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/parks/EventParkRlsRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitDataRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitDataRequest.class
deleted file mode 100644
index a4d5a5a..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitDataRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitInfoRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitInfoRequest.class
deleted file mode 100644
index dce8958..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitInfoRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitParamRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitParamRequest.class
deleted file mode 100644
index 8dbd2af..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitParamRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitRequest.class b/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitRequest.class
deleted file mode 100644
index 90786d1..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/request/event/visit/EventVisitRequest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AcsDeviceInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AcsDeviceInfoResponse.class
deleted file mode 100644
index 2a82922..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AcsDeviceInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AcsDeviceListResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AcsDeviceListResponse.class
deleted file mode 100644
index 721afd9..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AcsDeviceListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AppointmentInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AppointmentInfoResponse.class
deleted file mode 100644
index a195981..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AppointmentInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AppointmentResInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AppointmentResInfoResponse.class
deleted file mode 100644
index ab59863..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AppointmentResInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AscDeviceStatusInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AscDeviceStatusInfoResponse.class
deleted file mode 100644
index 0ee8f1a..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AscDeviceStatusInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AuthItemListDetailResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AuthItemListDetailResponse.class
deleted file mode 100644
index 435d93a..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AuthItemListDetailResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AuthItemListResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AuthItemListResponse.class
deleted file mode 100644
index 5b24928..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AuthItemListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AuthItemListTemplResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AuthItemListTemplResponse.class
deleted file mode 100644
index 857b37d..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/AuthItemListTemplResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/CardInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/CardInfoResponse.class
deleted file mode 100644
index 50cb752..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/CardInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/DoorsInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/DoorsInfoResponse.class
deleted file mode 100644
index 6bc4eb7..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/DoorsInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/DoorsListResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/DoorsListResponse.class
deleted file mode 100644
index e34e127..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/DoorsListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/EntranceListResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/EntranceListResponse.class
deleted file mode 100644
index f17a108..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/EntranceListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.class
deleted file mode 100644
index 84276ec..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/FaceAddOrEditesponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/FacePictureCheckResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/FacePictureCheckResponse.class
deleted file mode 100644
index 0b336f4..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/FacePictureCheckResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgInfoResponse.class
deleted file mode 100644
index b31ce2c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgOrUserAddFailureResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgOrUserAddFailureResponse.class
deleted file mode 100644
index 5a39cf9..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgOrUserAddFailureResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgOrUserAddResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgOrUserAddResponse.class
deleted file mode 100644
index 7a87d12..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgOrUserAddResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgOrUserAddSuccessResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgOrUserAddSuccessResponse.class
deleted file mode 100644
index 7ed57d8..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgOrUserAddSuccessResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgTimeRangeInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgTimeRangeInfoResponse.class
deleted file mode 100644
index 6206acc..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgTimeRangeInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgUpdateFailureResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgUpdateFailureResponse.class
deleted file mode 100644
index 306dd50..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/OrgUpdateFailureResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/ParkCrossRecordInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/ParkCrossRecordInfoResponse.class
deleted file mode 100644
index bb99c2c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/ParkCrossRecordInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/ParkListResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/ParkListResponse.class
deleted file mode 100644
index a181153..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/ParkListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/ParkReservationAddResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/ParkReservationAddResponse.class
deleted file mode 100644
index c3ff1e9..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/ParkReservationAddResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/PrivilegeGroupInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/PrivilegeGroupInfoResponse.class
deleted file mode 100644
index ba01e0c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/PrivilegeGroupInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/PrivilegeGroupListResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/PrivilegeGroupListResponse.class
deleted file mode 100644
index ae81e04..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/PrivilegeGroupListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskAdditionResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskAdditionResponse.class
deleted file mode 100644
index beda6e0..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskAdditionResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailCardFaceResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailCardFaceResponse.class
deleted file mode 100644
index 1802f4f..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailCardFaceResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailCardInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailCardInfoResponse.class
deleted file mode 100644
index ec52d1f..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailCardInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailFaceInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailFaceInfoResponse.class
deleted file mode 100644
index 4e445de..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailFaceInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailListResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailListResponse.class
deleted file mode 100644
index 70406b4..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailListResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailResponse.class
deleted file mode 100644
index b9ccd17..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskPersonDetailResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressDetailResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressDetailResponse.class
deleted file mode 100644
index 11519c2..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressDetailResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressNumResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressNumResponse.class
deleted file mode 100644
index fab8498..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressNumResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressResourceInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressResourceInfoResponse.class
deleted file mode 100644
index f1f146a..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressResourceInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressResourceResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressResourceResponse.class
deleted file mode 100644
index b3b63f5..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressResourceResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressResponse.class
deleted file mode 100644
index 56890de..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TaskProgressResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TempCarInRecordInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TempCarInRecordInfoResponse.class
deleted file mode 100644
index bf935fb..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/TempCarInRecordInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserAddResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserAddResponse.class
deleted file mode 100644
index 30688ba..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserAddResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserDelResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserDelResponse.class
deleted file mode 100644
index 3da4b7d..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserDelResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserInfoResponse.class
deleted file mode 100644
index adf9b62..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserPhotoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserPhotoResponse.class
deleted file mode 100644
index 1294b95..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserPhotoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserTimeRangeInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserTimeRangeInfoResponse.class
deleted file mode 100644
index 7550040..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/UserTimeRangeInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VehicleInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VehicleInfoResponse.class
deleted file mode 100644
index 4038ebe..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VehicleInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VehicleTimeRangeInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VehicleTimeRangeInfoResponse.class
deleted file mode 100644
index 28a3fd3..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VehicleTimeRangeInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VisitAppointmentMDJResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VisitAppointmentMDJResponse.class
deleted file mode 100644
index 996eb60..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VisitAppointmentMDJResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VisitAppointmentResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VisitAppointmentResponse.class
deleted file mode 100644
index 665ac14..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VisitAppointmentResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VisitingInfoResponse.class b/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VisitingInfoResponse.class
deleted file mode 100644
index 1c19119..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/model/param/respose/VisitingInfoResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/Dewlt.class b/server/service/target/classes/com/doumee/core/haikang/sdk/Dewlt.class
deleted file mode 100644
index 76d16f8..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/Dewlt.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$LOG_LEVEL_ENUM.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$LOG_LEVEL_ENUM.class
deleted file mode 100644
index 65fbb34..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$LOG_LEVEL_ENUM.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$OUT_USB_DEVICE_INFO.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$OUT_USB_DEVICE_INFO.class
deleted file mode 100644
index 627690b..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$OUT_USB_DEVICE_INFO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_ACTIVATE_CARD_RES.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_ACTIVATE_CARD_RES.class
deleted file mode 100644
index d8d68d9..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_ACTIVATE_CARD_RES.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_CERTIFICATE_INFO.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_CERTIFICATE_INFO.class
deleted file mode 100644
index 36ac84e..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_CERTIFICATE_INFO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_CONFIG_INPUT_INFO.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_CONFIG_INPUT_INFO.class
deleted file mode 100644
index 673ca23..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_CONFIG_INPUT_INFO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_CONFIG_OUTPUT_INFO.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_CONFIG_OUTPUT_INFO.class
deleted file mode 100644
index 7576ec4..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_CONFIG_OUTPUT_INFO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_DEVICE_INFO.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_DEVICE_INFO.class
deleted file mode 100644
index 9ce292f..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_DEVICE_INFO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_DEVICE_REG_RES.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_DEVICE_REG_RES.class
deleted file mode 100644
index 6fcfa5c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_DEVICE_REG_RES.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_USER_LOGIN_INFO.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_USER_LOGIN_INFO.class
deleted file mode 100644
index 39bff7f..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_USER_LOGIN_INFO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_WAIT_SECOND.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_WAIT_SECOND.class
deleted file mode 100644
index 0429a1d..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK$USB_WAIT_SECOND.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK.class
deleted file mode 100644
index 81e1025..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HCUsbSDK.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/sdk/HIKCSDemo.class b/server/service/target/classes/com/doumee/core/haikang/sdk/HIKCSDemo.class
deleted file mode 100644
index e98423a..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/sdk/HIKCSDemo.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$1.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$1.class
deleted file mode 100644
index 0494459..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$1.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$10.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$10.class
deleted file mode 100644
index e882abb..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$10.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$11.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$11.class
deleted file mode 100644
index a1b880c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$11.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$12.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$12.class
deleted file mode 100644
index f15b897..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$12.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$13.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$13.class
deleted file mode 100644
index 4d41ec1..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$13.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$14.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$14.class
deleted file mode 100644
index eaf188b..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$14.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$15.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$15.class
deleted file mode 100644
index a2728d6..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$15.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$16.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$16.class
deleted file mode 100644
index b84155b..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$16.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$17.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$17.class
deleted file mode 100644
index 7415d13..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$17.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$18.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$18.class
deleted file mode 100644
index 4295e62..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$18.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$19.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$19.class
deleted file mode 100644
index 1f14e9f..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$19.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$2.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$2.class
deleted file mode 100644
index 9f8eb17..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$2.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$20.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$20.class
deleted file mode 100644
index ea829a0..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$20.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$21.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$21.class
deleted file mode 100644
index be57118..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$21.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$22.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$22.class
deleted file mode 100644
index 631605a..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$22.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$23.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$23.class
deleted file mode 100644
index 452bfbb..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$23.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$24.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$24.class
deleted file mode 100644
index 7190cfd..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$24.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$25.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$25.class
deleted file mode 100644
index 1c48145..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$25.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$26.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$26.class
deleted file mode 100644
index 4018cf5..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$26.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$27.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$27.class
deleted file mode 100644
index 0949097..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$27.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$28.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$28.class
deleted file mode 100644
index cfd2c27..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$28.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$29.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$29.class
deleted file mode 100644
index 48fa25c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$29.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$3.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$3.class
deleted file mode 100644
index fa24ae2..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$3.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$30.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$30.class
deleted file mode 100644
index 70dd536..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$30.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$31.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$31.class
deleted file mode 100644
index bf323cd..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$31.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$32.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$32.class
deleted file mode 100644
index 22cc348..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$32.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$33.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$33.class
deleted file mode 100644
index 0b3dccb..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$33.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$34.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$34.class
deleted file mode 100644
index 0660534..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$34.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$35.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$35.class
deleted file mode 100644
index 479caad..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$35.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$36.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$36.class
deleted file mode 100644
index 63e44c8..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$36.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$37.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$37.class
deleted file mode 100644
index f39a027..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$37.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$38.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$38.class
deleted file mode 100644
index f87b54b..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$38.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$39.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$39.class
deleted file mode 100644
index 0772819..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$39.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$4.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$4.class
deleted file mode 100644
index a4c5f99..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$4.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$40.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$40.class
deleted file mode 100644
index 154c2bf..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$40.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$41.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$41.class
deleted file mode 100644
index ce6cd1b..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$41.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$42.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$42.class
deleted file mode 100644
index 5435219..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$42.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$43.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$43.class
deleted file mode 100644
index 21bf3b0..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$43.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$44.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$44.class
deleted file mode 100644
index a16f35d..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$44.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$45.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$45.class
deleted file mode 100644
index 1e3757b..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$45.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$46.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$46.class
deleted file mode 100644
index 1287f17..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$46.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$47.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$47.class
deleted file mode 100644
index f2ac40c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$47.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$48.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$48.class
deleted file mode 100644
index 5ad0aff..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$48.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$49.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$49.class
deleted file mode 100644
index a990277..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$49.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$5.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$5.class
deleted file mode 100644
index e318432..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$5.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$50.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$50.class
deleted file mode 100644
index 47f3b68..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$50.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$6.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$6.class
deleted file mode 100644
index 46ef74a..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$6.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$7.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$7.class
deleted file mode 100644
index e87194e..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$7.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$8.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$8.class
deleted file mode 100644
index ae1aa5d..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$8.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService$9.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService$9.class
deleted file mode 100644
index 936c25c..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService$9.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/haikang/service/HKService.class b/server/service/target/classes/com/doumee/core/haikang/service/HKService.class
deleted file mode 100644
index e4d3956..0000000
--- a/server/service/target/classes/com/doumee/core/haikang/service/HKService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/model/ApiResponse.class b/server/service/target/classes/com/doumee/core/model/ApiResponse.class
deleted file mode 100644
index 7afb74e..0000000
--- a/server/service/target/classes/com/doumee/core/model/ApiResponse.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/model/LoginUserInfo.class b/server/service/target/classes/com/doumee/core/model/LoginUserInfo.class
deleted file mode 100644
index 96d381f..0000000
--- a/server/service/target/classes/com/doumee/core/model/LoginUserInfo.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/model/LoginUserModel.class b/server/service/target/classes/com/doumee/core/model/LoginUserModel.class
deleted file mode 100644
index 403cc24..0000000
--- a/server/service/target/classes/com/doumee/core/model/LoginUserModel.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/model/PageData.class b/server/service/target/classes/com/doumee/core/model/PageData.class
deleted file mode 100644
index 3a086d3..0000000
--- a/server/service/target/classes/com/doumee/core/model/PageData.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/model/PageWrap$SortData.class b/server/service/target/classes/com/doumee/core/model/PageWrap$SortData.class
deleted file mode 100644
index 65f0b41..0000000
--- a/server/service/target/classes/com/doumee/core/model/PageWrap$SortData.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/model/PageWrap.class b/server/service/target/classes/com/doumee/core/model/PageWrap.class
deleted file mode 100644
index 0fb9d2a..0000000
--- a/server/service/target/classes/com/doumee/core/model/PageWrap.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/oss/AliOssService.class b/server/service/target/classes/com/doumee/core/oss/AliOssService.class
deleted file mode 100644
index bf56721..0000000
--- a/server/service/target/classes/com/doumee/core/oss/AliOssService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/oss/FileContent.class b/server/service/target/classes/com/doumee/core/oss/FileContent.class
deleted file mode 100644
index 96284c5..0000000
--- a/server/service/target/classes/com/doumee/core/oss/FileContent.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/oss/FileModel.class b/server/service/target/classes/com/doumee/core/oss/FileModel.class
deleted file mode 100644
index 3778c46..0000000
--- a/server/service/target/classes/com/doumee/core/oss/FileModel.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/oss/UploadFileService.class b/server/service/target/classes/com/doumee/core/oss/UploadFileService.class
deleted file mode 100644
index 93c7855..0000000
--- a/server/service/target/classes/com/doumee/core/oss/UploadFileService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateInputStream.class b/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateInputStream.class
deleted file mode 100644
index ac2451b..0000000
--- a/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateInputStream.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateOutputStream.class b/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateOutputStream.class
deleted file mode 100644
index 2696c43..0000000
--- a/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateOutputStream.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateRequestWrapper.class b/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateRequestWrapper.class
deleted file mode 100644
index 7100aba..0000000
--- a/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateRequestWrapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateResponseWrapper.class b/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateResponseWrapper.class
deleted file mode 100644
index f277e43..0000000
--- a/server/service/target/classes/com/doumee/core/servlet/ServletDuplicateResponseWrapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/servlet/ServletRewriteFilter.class b/server/service/target/classes/com/doumee/core/servlet/ServletRewriteFilter.class
deleted file mode 100644
index d07040d..0000000
--- a/server/service/target/classes/com/doumee/core/servlet/ServletRewriteFilter.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/CodeVerifyUtils.class b/server/service/target/classes/com/doumee/core/utils/CodeVerifyUtils.class
deleted file mode 100644
index 9e31102..0000000
--- a/server/service/target/classes/com/doumee/core/utils/CodeVerifyUtils.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$DOOR_ROLE_TYPE.class b/server/service/target/classes/com/doumee/core/utils/Constants$DOOR_ROLE_TYPE.class
deleted file mode 100644
index 5c5bb96..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$DOOR_ROLE_TYPE.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$DeviceRoleType.class b/server/service/target/classes/com/doumee/core/utils/Constants$DeviceRoleType.class
deleted file mode 100644
index 5b1e003..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$DeviceRoleType.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$EmpowerStatus.class b/server/service/target/classes/com/doumee/core/utils/Constants$EmpowerStatus.class
deleted file mode 100644
index a11f9d4..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$EmpowerStatus.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$MQ_KEY.class b/server/service/target/classes/com/doumee/core/utils/Constants$MQ_KEY.class
deleted file mode 100644
index abd29f1..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$MQ_KEY.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$MQ_TAG.class b/server/service/target/classes/com/doumee/core/utils/Constants$MQ_TAG.class
deleted file mode 100644
index cb51e92..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$MQ_TAG.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$MemberCard.class b/server/service/target/classes/com/doumee/core/utils/Constants$MemberCard.class
deleted file mode 100644
index 31394b4..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$MemberCard.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$RedisKeys.class b/server/service/target/classes/com/doumee/core/utils/Constants$RedisKeys.class
deleted file mode 100644
index 75170a4..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$RedisKeys.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$Status.class b/server/service/target/classes/com/doumee/core/utils/Constants$Status.class
deleted file mode 100644
index b1ade10..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$Status.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$VehiclePlateNoEnum.class b/server/service/target/classes/com/doumee/core/utils/Constants$VehiclePlateNoEnum.class
deleted file mode 100644
index 5f230d1..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$VehiclePlateNoEnum.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$VisitStatus.class b/server/service/target/classes/com/doumee/core/utils/Constants$VisitStatus.class
deleted file mode 100644
index fca00f8..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$VisitStatus.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$approveStatus.class b/server/service/target/classes/com/doumee/core/utils/Constants$approveStatus.class
deleted file mode 100644
index e2f2480..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$approveStatus.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants$memberType.class b/server/service/target/classes/com/doumee/core/utils/Constants$memberType.class
deleted file mode 100644
index b4ea782..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants$memberType.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Constants.class b/server/service/target/classes/com/doumee/core/utils/Constants.class
deleted file mode 100644
index 2e90da3..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Constants.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/DESUtil.class b/server/service/target/classes/com/doumee/core/utils/DESUtil.class
deleted file mode 100644
index 9a39531..0000000
--- a/server/service/target/classes/com/doumee/core/utils/DESUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Date.class b/server/service/target/classes/com/doumee/core/utils/Date.class
deleted file mode 100644
index a3716ab..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Date.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/DateUtil.class b/server/service/target/classes/com/doumee/core/utils/DateUtil.class
deleted file mode 100644
index 9f2fce5..0000000
--- a/server/service/target/classes/com/doumee/core/utils/DateUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/FaceImageCompress.class b/server/service/target/classes/com/doumee/core/utils/FaceImageCompress.class
deleted file mode 100644
index 131488c..0000000
--- a/server/service/target/classes/com/doumee/core/utils/FaceImageCompress.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/FileDigest.class b/server/service/target/classes/com/doumee/core/utils/FileDigest.class
deleted file mode 100644
index a87b55a..0000000
--- a/server/service/target/classes/com/doumee/core/utils/FileDigest.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/FtpUtil.class b/server/service/target/classes/com/doumee/core/utils/FtpUtil.class
deleted file mode 100644
index 09946bd..0000000
--- a/server/service/target/classes/com/doumee/core/utils/FtpUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/GeneratePicUtil.class b/server/service/target/classes/com/doumee/core/utils/GeneratePicUtil.class
deleted file mode 100644
index 85eca57..0000000
--- a/server/service/target/classes/com/doumee/core/utils/GeneratePicUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Http$HttpResult.class b/server/service/target/classes/com/doumee/core/utils/Http$HttpResult.class
deleted file mode 100644
index c22a7a4..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Http$HttpResult.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Http$HttpWrap.class b/server/service/target/classes/com/doumee/core/utils/Http$HttpWrap.class
deleted file mode 100644
index 136b659..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Http$HttpWrap.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Http.class b/server/service/target/classes/com/doumee/core/utils/Http.class
deleted file mode 100644
index 49b437b..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Http.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/HttpsTrustManager$1.class b/server/service/target/classes/com/doumee/core/utils/HttpsTrustManager$1.class
deleted file mode 100644
index 47cf27c..0000000
--- a/server/service/target/classes/com/doumee/core/utils/HttpsTrustManager$1.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/HttpsTrustManager.class b/server/service/target/classes/com/doumee/core/utils/HttpsTrustManager.class
deleted file mode 100644
index ba4782f..0000000
--- a/server/service/target/classes/com/doumee/core/utils/HttpsTrustManager.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/HttpsUtil$1.class b/server/service/target/classes/com/doumee/core/utils/HttpsUtil$1.class
deleted file mode 100644
index 7539d1b..0000000
--- a/server/service/target/classes/com/doumee/core/utils/HttpsUtil$1.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/HttpsUtil.class b/server/service/target/classes/com/doumee/core/utils/HttpsUtil.class
deleted file mode 100644
index 194a1bf..0000000
--- a/server/service/target/classes/com/doumee/core/utils/HttpsUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/ID$SnowflakeIdGenerator.class b/server/service/target/classes/com/doumee/core/utils/ID$SnowflakeIdGenerator.class
deleted file mode 100644
index d055e7e..0000000
--- a/server/service/target/classes/com/doumee/core/utils/ID$SnowflakeIdGenerator.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/ID.class b/server/service/target/classes/com/doumee/core/utils/ID.class
deleted file mode 100644
index 5de1c07..0000000
--- a/server/service/target/classes/com/doumee/core/utils/ID.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/IdCardTool.class b/server/service/target/classes/com/doumee/core/utils/IdCardTool.class
deleted file mode 100644
index 23879b8..0000000
--- a/server/service/target/classes/com/doumee/core/utils/IdCardTool.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/ImageBase64Util.class b/server/service/target/classes/com/doumee/core/utils/ImageBase64Util.class
deleted file mode 100644
index 7de080a..0000000
--- a/server/service/target/classes/com/doumee/core/utils/ImageBase64Util.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Location$Info.class b/server/service/target/classes/com/doumee/core/utils/Location$Info.class
deleted file mode 100644
index bd034ec..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Location$Info.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Location.class b/server/service/target/classes/com/doumee/core/utils/Location.class
deleted file mode 100644
index 2956585..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Location.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Monitor.class b/server/service/target/classes/com/doumee/core/utils/Monitor.class
deleted file mode 100644
index 7974d32..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Monitor.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/MyBatisPlus.class b/server/service/target/classes/com/doumee/core/utils/MyBatisPlus.class
deleted file mode 100644
index 21f286c..0000000
--- a/server/service/target/classes/com/doumee/core/utils/MyBatisPlus.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/PinYinUtil.class b/server/service/target/classes/com/doumee/core/utils/PinYinUtil.class
deleted file mode 100644
index 91861ea..0000000
--- a/server/service/target/classes/com/doumee/core/utils/PinYinUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/QrCodeUtils.class b/server/service/target/classes/com/doumee/core/utils/QrCodeUtils.class
deleted file mode 100644
index 99297af..0000000
--- a/server/service/target/classes/com/doumee/core/utils/QrCodeUtils.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/RandomString.class b/server/service/target/classes/com/doumee/core/utils/RandomString.class
deleted file mode 100644
index e5d9c9d..0000000
--- a/server/service/target/classes/com/doumee/core/utils/RandomString.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Secure.class b/server/service/target/classes/com/doumee/core/utils/Secure.class
deleted file mode 100644
index c28d9e7..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Secure.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Server.class b/server/service/target/classes/com/doumee/core/utils/Server.class
deleted file mode 100644
index 208db27..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Server.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Strings.class b/server/service/target/classes/com/doumee/core/utils/Strings.class
deleted file mode 100644
index 92ec273..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Strings.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/UserClient.class b/server/service/target/classes/com/doumee/core/utils/UserClient.class
deleted file mode 100644
index f0ed395..0000000
--- a/server/service/target/classes/com/doumee/core/utils/UserClient.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Utils.class b/server/service/target/classes/com/doumee/core/utils/Utils.class
deleted file mode 100644
index 4ae0963..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Utils.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/Week.class b/server/service/target/classes/com/doumee/core/utils/Week.class
deleted file mode 100644
index aaf185b..0000000
--- a/server/service/target/classes/com/doumee/core/utils/Week.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/aliyun/ALiYunSmSUtil.class b/server/service/target/classes/com/doumee/core/utils/aliyun/ALiYunSmSUtil.class
deleted file mode 100644
index 00710ee..0000000
--- a/server/service/target/classes/com/doumee/core/utils/aliyun/ALiYunSmSUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/aliyun/ALiYunUtil.class b/server/service/target/classes/com/doumee/core/utils/aliyun/ALiYunUtil.class
deleted file mode 100644
index f3e17d2..0000000
--- a/server/service/target/classes/com/doumee/core/utils/aliyun/ALiYunUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/kuaidi100/DeliveryDTO.class b/server/service/target/classes/com/doumee/core/utils/kuaidi100/DeliveryDTO.class
deleted file mode 100644
index cb78f90..0000000
--- a/server/service/target/classes/com/doumee/core/utils/kuaidi100/DeliveryDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/kuaidi100/DeliveryInfoDTO.class b/server/service/target/classes/com/doumee/core/utils/kuaidi100/DeliveryInfoDTO.class
deleted file mode 100644
index 5fcc403..0000000
--- a/server/service/target/classes/com/doumee/core/utils/kuaidi100/DeliveryInfoDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/kuaidi100/ExpressUtils.class b/server/service/target/classes/com/doumee/core/utils/kuaidi100/ExpressUtils.class
deleted file mode 100644
index e6b4624..0000000
--- a/server/service/target/classes/com/doumee/core/utils/kuaidi100/ExpressUtils.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/monitor/CPU.class b/server/service/target/classes/com/doumee/core/utils/monitor/CPU.class
deleted file mode 100644
index 26bccd0..0000000
--- a/server/service/target/classes/com/doumee/core/utils/monitor/CPU.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/monitor/Disk.class b/server/service/target/classes/com/doumee/core/utils/monitor/Disk.class
deleted file mode 100644
index 2cdffdb..0000000
--- a/server/service/target/classes/com/doumee/core/utils/monitor/Disk.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/monitor/JVM.class b/server/service/target/classes/com/doumee/core/utils/monitor/JVM.class
deleted file mode 100644
index b0548d4..0000000
--- a/server/service/target/classes/com/doumee/core/utils/monitor/JVM.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/monitor/Memory.class b/server/service/target/classes/com/doumee/core/utils/monitor/Memory.class
deleted file mode 100644
index 77b9254..0000000
--- a/server/service/target/classes/com/doumee/core/utils/monitor/Memory.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/redis/RedisConfig.class b/server/service/target/classes/com/doumee/core/utils/redis/RedisConfig.class
deleted file mode 100644
index 2243074..0000000
--- a/server/service/target/classes/com/doumee/core/utils/redis/RedisConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/redis/RedisConverter.class b/server/service/target/classes/com/doumee/core/utils/redis/RedisConverter.class
deleted file mode 100644
index f256503..0000000
--- a/server/service/target/classes/com/doumee/core/utils/redis/RedisConverter.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/redis/RedisUtil.class b/server/service/target/classes/com/doumee/core/utils/redis/RedisUtil.class
deleted file mode 100644
index 40f59c3..0000000
--- a/server/service/target/classes/com/doumee/core/utils/redis/RedisUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/utils/tyyun/TyyZosUtil.class b/server/service/target/classes/com/doumee/core/utils/tyyun/TyyZosUtil.class
deleted file mode 100644
index 62f758b..0000000
--- a/server/service/target/classes/com/doumee/core/utils/tyyun/TyyZosUtil.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/wx/AccessToken.class b/server/service/target/classes/com/doumee/core/wx/AccessToken.class
deleted file mode 100644
index 1b944d0..0000000
--- a/server/service/target/classes/com/doumee/core/wx/AccessToken.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/wx/TemplateData.class b/server/service/target/classes/com/doumee/core/wx/TemplateData.class
deleted file mode 100644
index f617975..0000000
--- a/server/service/target/classes/com/doumee/core/wx/TemplateData.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/wx/WXConstant.class b/server/service/target/classes/com/doumee/core/wx/WXConstant.class
deleted file mode 100644
index 60b2b84..0000000
--- a/server/service/target/classes/com/doumee/core/wx/WXConstant.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/wx/WxMiniConfig.class b/server/service/target/classes/com/doumee/core/wx/WxMiniConfig.class
deleted file mode 100644
index 84a1c17..0000000
--- a/server/service/target/classes/com/doumee/core/wx/WxMiniConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/wx/WxMiniUtilService.class b/server/service/target/classes/com/doumee/core/wx/WxMiniUtilService.class
deleted file mode 100644
index 2cf244b..0000000
--- a/server/service/target/classes/com/doumee/core/wx/WxMiniUtilService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/wx/WxMsgVO.class b/server/service/target/classes/com/doumee/core/wx/WxMsgVO.class
deleted file mode 100644
index 1452d4e..0000000
--- a/server/service/target/classes/com/doumee/core/wx/WxMsgVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/wx/WxPayProperties.class b/server/service/target/classes/com/doumee/core/wx/WxPayProperties.class
deleted file mode 100644
index 920529c..0000000
--- a/server/service/target/classes/com/doumee/core/wx/WxPayProperties.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/wx/wxPlat/WxPlatConfig.class b/server/service/target/classes/com/doumee/core/wx/wxPlat/WxPlatConfig.class
deleted file mode 100644
index 6c71e19..0000000
--- a/server/service/target/classes/com/doumee/core/wx/wxPlat/WxPlatConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/core/wx/wxPlat/WxPlatNotice.class b/server/service/target/classes/com/doumee/core/wx/wxPlat/WxPlatNotice.class
deleted file mode 100644
index 2bb0007..0000000
--- a/server/service/target/classes/com/doumee/core/wx/wxPlat/WxPlatNotice.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/CarsQuery.class b/server/service/target/classes/com/doumee/dao/admin/request/CarsQuery.class
deleted file mode 100644
index a71215e..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/CarsQuery.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/DeviceEventQuery.class b/server/service/target/classes/com/doumee/dao/admin/request/DeviceEventQuery.class
deleted file mode 100644
index a90d8da..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/DeviceEventQuery.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/FcodeImport.class b/server/service/target/classes/com/doumee/dao/admin/request/FcodeImport.class
deleted file mode 100644
index 5f460e4..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/FcodeImport.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/InDeviceEntranceParam.class b/server/service/target/classes/com/doumee/dao/admin/request/InDeviceEntranceParam.class
deleted file mode 100644
index 160850e..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/InDeviceEntranceParam.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/LaborConfigDTO.class b/server/service/target/classes/com/doumee/dao/admin/request/LaborConfigDTO.class
deleted file mode 100644
index 9ae00b0..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/LaborConfigDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/LaborConfigParam.class b/server/service/target/classes/com/doumee/dao/admin/request/LaborConfigParam.class
deleted file mode 100644
index bf4e372..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/LaborConfigParam.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/LaborEmpowerDTO$LaborMemberEmpower.class b/server/service/target/classes/com/doumee/dao/admin/request/LaborEmpowerDTO$LaborMemberEmpower.class
deleted file mode 100644
index b7807bd..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/LaborEmpowerDTO$LaborMemberEmpower.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/LaborEmpowerDTO.class b/server/service/target/classes/com/doumee/dao/admin/request/LaborEmpowerDTO.class
deleted file mode 100644
index e48f1a7..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/LaborEmpowerDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/LaborMemberDTO.class b/server/service/target/classes/com/doumee/dao/admin/request/LaborMemberDTO.class
deleted file mode 100644
index 47570c2..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/LaborMemberDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/MemberImport.class b/server/service/target/classes/com/doumee/dao/admin/request/MemberImport.class
deleted file mode 100644
index afbeaea..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/MemberImport.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/MemberQuery.class b/server/service/target/classes/com/doumee/dao/admin/request/MemberQuery.class
deleted file mode 100644
index 84e380d..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/MemberQuery.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/OptionsObject.class b/server/service/target/classes/com/doumee/dao/admin/request/OptionsObject.class
deleted file mode 100644
index c14d513..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/OptionsObject.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/QrOpenDoorDto.class b/server/service/target/classes/com/doumee/dao/admin/request/QrOpenDoorDto.class
deleted file mode 100644
index 9fb94d9..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/QrOpenDoorDto.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/RetentionQuery.class b/server/service/target/classes/com/doumee/dao/admin/request/RetentionQuery.class
deleted file mode 100644
index bff2f5b..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/RetentionQuery.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/ShopImport.class b/server/service/target/classes/com/doumee/dao/admin/request/ShopImport.class
deleted file mode 100644
index 275dd94..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/ShopImport.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/UpdateShopSortDTO.class b/server/service/target/classes/com/doumee/dao/admin/request/UpdateShopSortDTO.class
deleted file mode 100644
index 1ede6ba..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/UpdateShopSortDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/VisitConfigDTO.class b/server/service/target/classes/com/doumee/dao/admin/request/VisitConfigDTO.class
deleted file mode 100644
index 3904594..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/VisitConfigDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/VisitConfigParam.class b/server/service/target/classes/com/doumee/dao/admin/request/VisitConfigParam.class
deleted file mode 100644
index 30375d4..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/VisitConfigParam.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/request/VisitEventQuery.class b/server/service/target/classes/com/doumee/dao/admin/request/VisitEventQuery.class
deleted file mode 100644
index c8c1875..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/request/VisitEventQuery.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/CarEventDTO.class b/server/service/target/classes/com/doumee/dao/admin/response/CarEventDTO.class
deleted file mode 100644
index f8f8d0b..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/CarEventDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/CarsDTO.class b/server/service/target/classes/com/doumee/dao/admin/response/CarsDTO.class
deleted file mode 100644
index e644bb3..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/CarsDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/CompanyDTO.class b/server/service/target/classes/com/doumee/dao/admin/response/CompanyDTO.class
deleted file mode 100644
index b071450..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/CompanyDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/DevWgDataResponseParam.class b/server/service/target/classes/com/doumee/dao/admin/response/DevWgDataResponseParam.class
deleted file mode 100644
index cd6c9f3..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/DevWgDataResponseParam.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/DevWgResponseParam.class b/server/service/target/classes/com/doumee/dao/admin/response/DevWgResponseParam.class
deleted file mode 100644
index a6f4bd5..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/DevWgResponseParam.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/DevWgYtjResponseParam.class b/server/service/target/classes/com/doumee/dao/admin/response/DevWgYtjResponseParam.class
deleted file mode 100644
index 8173297..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/DevWgYtjResponseParam.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/DeviceEventDTO.class b/server/service/target/classes/com/doumee/dao/admin/response/DeviceEventDTO.class
deleted file mode 100644
index 1742a7c..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/DeviceEventDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/MemberInfoDTO.class b/server/service/target/classes/com/doumee/dao/admin/response/MemberInfoDTO.class
deleted file mode 100644
index 3018614..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/MemberInfoDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/ProblemDTO.class b/server/service/target/classes/com/doumee/dao/admin/response/ProblemDTO.class
deleted file mode 100644
index dfee222..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/ProblemDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/StagingDataVO.class b/server/service/target/classes/com/doumee/dao/admin/response/StagingDataVO.class
deleted file mode 100644
index bd352a3..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/StagingDataVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/admin/response/VisitEventDTO.class b/server/service/target/classes/com/doumee/dao/admin/response/VisitEventDTO.class
deleted file mode 100644
index 6b9dae5..0000000
--- a/server/service/target/classes/com/doumee/dao/admin/response/VisitEventDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/ActionsMapper.class b/server/service/target/classes/com/doumee/dao/business/ActionsMapper.class
deleted file mode 100644
index f93843c..0000000
--- a/server/service/target/classes/com/doumee/dao/business/ActionsMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/BjParamMapper.class b/server/service/target/classes/com/doumee/dao/business/BjParamMapper.class
deleted file mode 100644
index 24f4664..0000000
--- a/server/service/target/classes/com/doumee/dao/business/BjParamMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/CategoryMapper.class b/server/service/target/classes/com/doumee/dao/business/CategoryMapper.class
deleted file mode 100644
index 0f78a6e..0000000
--- a/server/service/target/classes/com/doumee/dao/business/CategoryMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/CategorySegMapper.class b/server/service/target/classes/com/doumee/dao/business/CategorySegMapper.class
deleted file mode 100644
index 52ecbea..0000000
--- a/server/service/target/classes/com/doumee/dao/business/CategorySegMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/CrmInterfaceLogMapper.class b/server/service/target/classes/com/doumee/dao/business/CrmInterfaceLogMapper.class
deleted file mode 100644
index 26ce807..0000000
--- a/server/service/target/classes/com/doumee/dao/business/CrmInterfaceLogMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/CustomerLogMapper.class b/server/service/target/classes/com/doumee/dao/business/CustomerLogMapper.class
deleted file mode 100644
index e773815..0000000
--- a/server/service/target/classes/com/doumee/dao/business/CustomerLogMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/CustomerMapper.class b/server/service/target/classes/com/doumee/dao/business/CustomerMapper.class
deleted file mode 100644
index baa377e..0000000
--- a/server/service/target/classes/com/doumee/dao/business/CustomerMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/IamInterfaceLogMapper.class b/server/service/target/classes/com/doumee/dao/business/IamInterfaceLogMapper.class
deleted file mode 100644
index 5f114f4..0000000
--- a/server/service/target/classes/com/doumee/dao/business/IamInterfaceLogMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/InterfaceLogMapper.class b/server/service/target/classes/com/doumee/dao/business/InterfaceLogMapper.class
deleted file mode 100644
index f0024b9..0000000
--- a/server/service/target/classes/com/doumee/dao/business/InterfaceLogMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/MemberMapper.class b/server/service/target/classes/com/doumee/dao/business/MemberMapper.class
deleted file mode 100644
index 2d346a7..0000000
--- a/server/service/target/classes/com/doumee/dao/business/MemberMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/MultifileMapper.class b/server/service/target/classes/com/doumee/dao/business/MultifileMapper.class
deleted file mode 100644
index 29a0982..0000000
--- a/server/service/target/classes/com/doumee/dao/business/MultifileMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/NewsMapper.class b/server/service/target/classes/com/doumee/dao/business/NewsMapper.class
deleted file mode 100644
index 29ecb81..0000000
--- a/server/service/target/classes/com/doumee/dao/business/NewsMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/SegmentsMapper.class b/server/service/target/classes/com/doumee/dao/business/SegmentsMapper.class
deleted file mode 100644
index eeb0836..0000000
--- a/server/service/target/classes/com/doumee/dao/business/SegmentsMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/ShopMapper.class b/server/service/target/classes/com/doumee/dao/business/ShopMapper.class
deleted file mode 100644
index de18db2..0000000
--- a/server/service/target/classes/com/doumee/dao/business/ShopMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/UsersMapper.class b/server/service/target/classes/com/doumee/dao/business/UsersMapper.class
deleted file mode 100644
index de7b109..0000000
--- a/server/service/target/classes/com/doumee/dao/business/UsersMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/dto/BaseQueryDto.class b/server/service/target/classes/com/doumee/dao/business/dto/BaseQueryDto.class
deleted file mode 100644
index 930e620..0000000
--- a/server/service/target/classes/com/doumee/dao/business/dto/BaseQueryDto.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/join/MemberJoinMapper.class b/server/service/target/classes/com/doumee/dao/business/join/MemberJoinMapper.class
deleted file mode 100644
index 9dd4ba0..0000000
--- a/server/service/target/classes/com/doumee/dao/business/join/MemberJoinMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/join/ShopJoinMapper.class b/server/service/target/classes/com/doumee/dao/business/join/ShopJoinMapper.class
deleted file mode 100644
index 267d858..0000000
--- a/server/service/target/classes/com/doumee/dao/business/join/ShopJoinMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/Actions.class b/server/service/target/classes/com/doumee/dao/business/model/Actions.class
deleted file mode 100644
index d061b7e..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/Actions.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/BjParam.class b/server/service/target/classes/com/doumee/dao/business/model/BjParam.class
deleted file mode 100644
index be01dd5..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/BjParam.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/Category.class b/server/service/target/classes/com/doumee/dao/business/model/Category.class
deleted file mode 100644
index 5b95ce9..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/Category.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/CategorySeg.class b/server/service/target/classes/com/doumee/dao/business/model/CategorySeg.class
deleted file mode 100644
index 3662b62..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/CategorySeg.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/CrmInterfaceLog.class b/server/service/target/classes/com/doumee/dao/business/model/CrmInterfaceLog.class
deleted file mode 100644
index 61cb2e9..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/CrmInterfaceLog.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/Customer.class b/server/service/target/classes/com/doumee/dao/business/model/Customer.class
deleted file mode 100644
index 9de7d1d..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/Customer.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/CustomerLog.class b/server/service/target/classes/com/doumee/dao/business/model/CustomerLog.class
deleted file mode 100644
index 6ebb2d9..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/CustomerLog.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/IamInterfaceLog.class b/server/service/target/classes/com/doumee/dao/business/model/IamInterfaceLog.class
deleted file mode 100644
index 824d2ad..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/IamInterfaceLog.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/InterfaceLog.class b/server/service/target/classes/com/doumee/dao/business/model/InterfaceLog.class
deleted file mode 100644
index 9c4793a..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/InterfaceLog.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/Member.class b/server/service/target/classes/com/doumee/dao/business/model/Member.class
deleted file mode 100644
index 5198e31..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/Member.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/Multifile.class b/server/service/target/classes/com/doumee/dao/business/model/Multifile.class
deleted file mode 100644
index b243a34..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/Multifile.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/News.class b/server/service/target/classes/com/doumee/dao/business/model/News.class
deleted file mode 100644
index 0fe16f8..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/News.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/Segments.class b/server/service/target/classes/com/doumee/dao/business/model/Segments.class
deleted file mode 100644
index d946d15..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/Segments.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/Shop.class b/server/service/target/classes/com/doumee/dao/business/model/Shop.class
deleted file mode 100644
index 04e6ffe..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/Shop.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/model/Users.class b/server/service/target/classes/com/doumee/dao/business/model/Users.class
deleted file mode 100644
index 2d31085..0000000
--- a/server/service/target/classes/com/doumee/dao/business/model/Users.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/vo/ShopTree.class b/server/service/target/classes/com/doumee/dao/business/vo/ShopTree.class
deleted file mode 100644
index f08fe81..0000000
--- a/server/service/target/classes/com/doumee/dao/business/vo/ShopTree.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/business/vo/ShopTreeVo.class b/server/service/target/classes/com/doumee/dao/business/vo/ShopTreeVo.class
deleted file mode 100644
index 97ffc69..0000000
--- a/server/service/target/classes/com/doumee/dao/business/vo/ShopTreeVo.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemDataPermissionMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemDataPermissionMapper.class
deleted file mode 100644
index 47ab129..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemDataPermissionMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemDepartmentMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemDepartmentMapper.class
deleted file mode 100644
index b3d05ca..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemDepartmentMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemDepartmentUserMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemDepartmentUserMapper.class
deleted file mode 100644
index 7117424..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemDepartmentUserMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemDictDataMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemDictDataMapper.class
deleted file mode 100644
index 1442c51..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemDictDataMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemDictMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemDictMapper.class
deleted file mode 100644
index cdd8f90..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemDictMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemLoginLogMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemLoginLogMapper.class
deleted file mode 100644
index 10e5000..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemLoginLogMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemMenuMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemMenuMapper.class
deleted file mode 100644
index e8605f6..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemMenuMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemPermissionMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemPermissionMapper.class
deleted file mode 100644
index a39fb4d..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemPermissionMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemPositionMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemPositionMapper.class
deleted file mode 100644
index c1edca8..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemPositionMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemPositionUserMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemPositionUserMapper.class
deleted file mode 100644
index 8f3d8fd..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemPositionUserMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemRoleMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemRoleMapper.class
deleted file mode 100644
index 8cd40de..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemRoleMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemRoleMenuMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemRoleMenuMapper.class
deleted file mode 100644
index 322f04b..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemRoleMenuMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemRolePermissionMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemRolePermissionMapper.class
deleted file mode 100644
index 8b064e8..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemRolePermissionMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemTraceLogMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemTraceLogMapper.class
deleted file mode 100644
index c640fcb..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemTraceLogMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemUserJoinMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemUserJoinMapper.class
deleted file mode 100644
index 4ed99e9..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemUserJoinMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemUserMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemUserMapper.class
deleted file mode 100644
index da32bb6..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemUserMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/SystemUserRoleMapper.class b/server/service/target/classes/com/doumee/dao/system/SystemUserRoleMapper.class
deleted file mode 100644
index 9010604..0000000
--- a/server/service/target/classes/com/doumee/dao/system/SystemUserRoleMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/CreateRoleMenuDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/CreateRoleMenuDTO.class
deleted file mode 100644
index e3bb162..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/CreateRoleMenuDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/CreateRolePermissionDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/CreateRolePermissionDTO.class
deleted file mode 100644
index 5d20eac..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/CreateRolePermissionDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/CreateSystemUserDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/CreateSystemUserDTO.class
deleted file mode 100644
index 85eab22..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/CreateSystemUserDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/CreateUserRoleDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/CreateUserRoleDTO.class
deleted file mode 100644
index ac45ae1..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/CreateUserRoleDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/ImportSystemUserDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/ImportSystemUserDTO.class
deleted file mode 100644
index 890c52e..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/ImportSystemUserDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/LoginDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/LoginDTO.class
deleted file mode 100644
index d675301..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/LoginDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/MemberRechargeDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/MemberRechargeDTO.class
deleted file mode 100644
index ba35a50..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/MemberRechargeDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemDepartmentDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemDepartmentDTO.class
deleted file mode 100644
index ae90a8c..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemDepartmentDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemDictDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemDictDTO.class
deleted file mode 100644
index d8b067c..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemDictDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemDictDataDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemDictDataDTO.class
deleted file mode 100644
index e783d61..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemDictDataDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemLoginLogDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemLoginLogDTO.class
deleted file mode 100644
index 45e44cb..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemLoginLogDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemPermissionDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemPermissionDTO.class
deleted file mode 100644
index cb660a0..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemPermissionDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemRoleDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemRoleDTO.class
deleted file mode 100644
index 63df710..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemRoleDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemTraceLogDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemTraceLogDTO.class
deleted file mode 100644
index bc0d00b..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemTraceLogDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemUserDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemUserDTO.class
deleted file mode 100644
index fe2d2cb..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/QuerySystemUserDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/ResetSystemUserPwdDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/ResetSystemUserPwdDTO.class
deleted file mode 100644
index 16fbd4c..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/ResetSystemUserPwdDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/UpdatePwdDto.class b/server/service/target/classes/com/doumee/dao/system/dto/UpdatePwdDto.class
deleted file mode 100644
index da555b5..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/UpdatePwdDto.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/UpdateSystemMenuSortDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/UpdateSystemMenuSortDTO.class
deleted file mode 100644
index e3cc3ea..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/UpdateSystemMenuSortDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/dto/UserStatisticsDTO.class b/server/service/target/classes/com/doumee/dao/system/dto/UserStatisticsDTO.class
deleted file mode 100644
index 14e8f39..0000000
--- a/server/service/target/classes/com/doumee/dao/system/dto/UserStatisticsDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemDataPermission.class b/server/service/target/classes/com/doumee/dao/system/model/SystemDataPermission.class
deleted file mode 100644
index d42fb11..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemDataPermission.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemDepartment.class b/server/service/target/classes/com/doumee/dao/system/model/SystemDepartment.class
deleted file mode 100644
index 369e0bd..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemDepartment.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemDepartmentUser.class b/server/service/target/classes/com/doumee/dao/system/model/SystemDepartmentUser.class
deleted file mode 100644
index f149b2a..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemDepartmentUser.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemDict.class b/server/service/target/classes/com/doumee/dao/system/model/SystemDict.class
deleted file mode 100644
index 85e8150..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemDict.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemDictData.class b/server/service/target/classes/com/doumee/dao/system/model/SystemDictData.class
deleted file mode 100644
index b594c46..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemDictData.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemLoginLog.class b/server/service/target/classes/com/doumee/dao/system/model/SystemLoginLog.class
deleted file mode 100644
index 750381b..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemLoginLog.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemMenu.class b/server/service/target/classes/com/doumee/dao/system/model/SystemMenu.class
deleted file mode 100644
index d360bee..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemMenu.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemPermission.class b/server/service/target/classes/com/doumee/dao/system/model/SystemPermission.class
deleted file mode 100644
index 7838d5e..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemPermission.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemPosition.class b/server/service/target/classes/com/doumee/dao/system/model/SystemPosition.class
deleted file mode 100644
index a415e23..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemPosition.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemPositionUser.class b/server/service/target/classes/com/doumee/dao/system/model/SystemPositionUser.class
deleted file mode 100644
index 384a09b..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemPositionUser.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemRole.class b/server/service/target/classes/com/doumee/dao/system/model/SystemRole.class
deleted file mode 100644
index 868d559..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemRole.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemRoleMenu.class b/server/service/target/classes/com/doumee/dao/system/model/SystemRoleMenu.class
deleted file mode 100644
index 9ccfb24..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemRoleMenu.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemRolePermission.class b/server/service/target/classes/com/doumee/dao/system/model/SystemRolePermission.class
deleted file mode 100644
index ac263bb..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemRolePermission.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemTraceLog.class b/server/service/target/classes/com/doumee/dao/system/model/SystemTraceLog.class
deleted file mode 100644
index 45dcd5b..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemTraceLog.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemUser.class b/server/service/target/classes/com/doumee/dao/system/model/SystemUser.class
deleted file mode 100644
index f6b3ca7..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemUser.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/model/SystemUserRole.class b/server/service/target/classes/com/doumee/dao/system/model/SystemUserRole.class
deleted file mode 100644
index 67678ff..0000000
--- a/server/service/target/classes/com/doumee/dao/system/model/SystemUserRole.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemDataPermissionListVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemDataPermissionListVO.class
deleted file mode 100644
index d1a058c..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemDataPermissionListVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemDepartmentListVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemDepartmentListVO.class
deleted file mode 100644
index 61c41eb..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemDepartmentListVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemDictDataListVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemDictDataListVO.class
deleted file mode 100644
index 88f200e..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemDictDataListVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemDictListVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemDictListVO.class
deleted file mode 100644
index eae4539..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemDictListVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemMenuListVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemMenuListVO.class
deleted file mode 100644
index fcd97a0..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemMenuListVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemMenuNodeVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemMenuNodeVO.class
deleted file mode 100644
index d158ab4..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemMenuNodeVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemPermissionListVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemPermissionListVO.class
deleted file mode 100644
index 816e8fb..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemPermissionListVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemPositionListVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemPositionListVO.class
deleted file mode 100644
index c3c9739..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemPositionListVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemRoleListVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemRoleListVO.class
deleted file mode 100644
index 05f6ffa..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemRoleListVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemUserDetailVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemUserDetailVO.class
deleted file mode 100644
index 392c07b..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemUserDetailVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemUserListVO.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemUserListVO.class
deleted file mode 100644
index 88e76e3..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemUserListVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/system/vo/SystemUserSimpleVo.class b/server/service/target/classes/com/doumee/dao/system/vo/SystemUserSimpleVo.class
deleted file mode 100644
index 2bf2c0a..0000000
--- a/server/service/target/classes/com/doumee/dao/system/vo/SystemUserSimpleVo.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/timer/entity/JobState.class b/server/service/target/classes/com/doumee/dao/timer/entity/JobState.class
deleted file mode 100644
index 0af41ba..0000000
--- a/server/service/target/classes/com/doumee/dao/timer/entity/JobState.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/timer/entity/LogState.class b/server/service/target/classes/com/doumee/dao/timer/entity/LogState.class
deleted file mode 100644
index 5269534..0000000
--- a/server/service/target/classes/com/doumee/dao/timer/entity/LogState.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/timer/entity/QuartzJob.class b/server/service/target/classes/com/doumee/dao/timer/entity/QuartzJob.class
deleted file mode 100644
index 6e0d5ec..0000000
--- a/server/service/target/classes/com/doumee/dao/timer/entity/QuartzJob.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/timer/entity/QuartzLog.class b/server/service/target/classes/com/doumee/dao/timer/entity/QuartzLog.class
deleted file mode 100644
index 6fe2252..0000000
--- a/server/service/target/classes/com/doumee/dao/timer/entity/QuartzLog.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/timer/mapper/QuartzJobMapper.class b/server/service/target/classes/com/doumee/dao/timer/mapper/QuartzJobMapper.class
deleted file mode 100644
index 4ce0e46..0000000
--- a/server/service/target/classes/com/doumee/dao/timer/mapper/QuartzJobMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/timer/mapper/QuartzLogMapper.class b/server/service/target/classes/com/doumee/dao/timer/mapper/QuartzLogMapper.class
deleted file mode 100644
index 677cd62..0000000
--- a/server/service/target/classes/com/doumee/dao/timer/mapper/QuartzLogMapper.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/timer/scheduler/QuartzManage.class b/server/service/target/classes/com/doumee/dao/timer/scheduler/QuartzManage.class
deleted file mode 100644
index 44fa347..0000000
--- a/server/service/target/classes/com/doumee/dao/timer/scheduler/QuartzManage.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/timer/scheduler/QuartzRecord.class b/server/service/target/classes/com/doumee/dao/timer/scheduler/QuartzRecord.class
deleted file mode 100644
index 8086394..0000000
--- a/server/service/target/classes/com/doumee/dao/timer/scheduler/QuartzRecord.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/web/reqeust/AccountLoginDTO.class b/server/service/target/classes/com/doumee/dao/web/reqeust/AccountLoginDTO.class
deleted file mode 100644
index a1b6b89..0000000
--- a/server/service/target/classes/com/doumee/dao/web/reqeust/AccountLoginDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/web/reqeust/AuditApproveDTO.class b/server/service/target/classes/com/doumee/dao/web/reqeust/AuditApproveDTO.class
deleted file mode 100644
index e9832d6..0000000
--- a/server/service/target/classes/com/doumee/dao/web/reqeust/AuditApproveDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/web/reqeust/CheckVisitedDTO.class b/server/service/target/classes/com/doumee/dao/web/reqeust/CheckVisitedDTO.class
deleted file mode 100644
index 38fca8b..0000000
--- a/server/service/target/classes/com/doumee/dao/web/reqeust/CheckVisitedDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/web/reqeust/ErpVisitDTO.class b/server/service/target/classes/com/doumee/dao/web/reqeust/ErpVisitDTO.class
deleted file mode 100644
index 813ebb2..0000000
--- a/server/service/target/classes/com/doumee/dao/web/reqeust/ErpVisitDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/web/reqeust/ErpWithVisitDTO.class b/server/service/target/classes/com/doumee/dao/web/reqeust/ErpWithVisitDTO.class
deleted file mode 100644
index f75ba19..0000000
--- a/server/service/target/classes/com/doumee/dao/web/reqeust/ErpWithVisitDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/web/reqeust/FinishAnswerDTO.class b/server/service/target/classes/com/doumee/dao/web/reqeust/FinishAnswerDTO.class
deleted file mode 100644
index 760aea6..0000000
--- a/server/service/target/classes/com/doumee/dao/web/reqeust/FinishAnswerDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/web/reqeust/VisitMemberDTO.class b/server/service/target/classes/com/doumee/dao/web/reqeust/VisitMemberDTO.class
deleted file mode 100644
index 1a448f5..0000000
--- a/server/service/target/classes/com/doumee/dao/web/reqeust/VisitMemberDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/web/reqeust/VisitRecordDTO.class b/server/service/target/classes/com/doumee/dao/web/reqeust/VisitRecordDTO.class
deleted file mode 100644
index 4ebee1b..0000000
--- a/server/service/target/classes/com/doumee/dao/web/reqeust/VisitRecordDTO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/web/response/MemberVO.class b/server/service/target/classes/com/doumee/dao/web/response/MemberVO.class
deleted file mode 100644
index 0220e52..0000000
--- a/server/service/target/classes/com/doumee/dao/web/response/MemberVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/dao/web/response/WxAuthorizeVO.class b/server/service/target/classes/com/doumee/dao/web/response/WxAuthorizeVO.class
deleted file mode 100644
index 67fccc6..0000000
--- a/server/service/target/classes/com/doumee/dao/web/response/WxAuthorizeVO.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/aware/DepartmentDataPermissionAware$1.class b/server/service/target/classes/com/doumee/service/aware/DepartmentDataPermissionAware$1.class
deleted file mode 100644
index 2421e91..0000000
--- a/server/service/target/classes/com/doumee/service/aware/DepartmentDataPermissionAware$1.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/aware/DepartmentDataPermissionAware.class b/server/service/target/classes/com/doumee/service/aware/DepartmentDataPermissionAware.class
deleted file mode 100644
index 0a41cee..0000000
--- a/server/service/target/classes/com/doumee/service/aware/DepartmentDataPermissionAware.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/aware/PositionDataPermissionAware.class b/server/service/target/classes/com/doumee/service/aware/PositionDataPermissionAware.class
deleted file mode 100644
index 4b1fedd..0000000
--- a/server/service/target/classes/com/doumee/service/aware/PositionDataPermissionAware.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/ActionsService.class b/server/service/target/classes/com/doumee/service/business/ActionsService.class
deleted file mode 100644
index 2c7069b..0000000
--- a/server/service/target/classes/com/doumee/service/business/ActionsService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/BjParamService.class b/server/service/target/classes/com/doumee/service/business/BjParamService.class
deleted file mode 100644
index 993f16e..0000000
--- a/server/service/target/classes/com/doumee/service/business/BjParamService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/CategorySegService.class b/server/service/target/classes/com/doumee/service/business/CategorySegService.class
deleted file mode 100644
index 13f61c1..0000000
--- a/server/service/target/classes/com/doumee/service/business/CategorySegService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/CategoryService.class b/server/service/target/classes/com/doumee/service/business/CategoryService.class
deleted file mode 100644
index b133c47..0000000
--- a/server/service/target/classes/com/doumee/service/business/CategoryService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/CrmInterfaceLogService.class b/server/service/target/classes/com/doumee/service/business/CrmInterfaceLogService.class
deleted file mode 100644
index 138e777..0000000
--- a/server/service/target/classes/com/doumee/service/business/CrmInterfaceLogService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/CustomerLogService.class b/server/service/target/classes/com/doumee/service/business/CustomerLogService.class
deleted file mode 100644
index 4237d79..0000000
--- a/server/service/target/classes/com/doumee/service/business/CustomerLogService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/CustomerService.class b/server/service/target/classes/com/doumee/service/business/CustomerService.class
deleted file mode 100644
index ff980ee..0000000
--- a/server/service/target/classes/com/doumee/service/business/CustomerService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/IamInterfaceLogService.class b/server/service/target/classes/com/doumee/service/business/IamInterfaceLogService.class
deleted file mode 100644
index 14d0dda..0000000
--- a/server/service/target/classes/com/doumee/service/business/IamInterfaceLogService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/InitService.class b/server/service/target/classes/com/doumee/service/business/InitService.class
deleted file mode 100644
index 0626fa1..0000000
--- a/server/service/target/classes/com/doumee/service/business/InitService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/InterfaceLogService.class b/server/service/target/classes/com/doumee/service/business/InterfaceLogService.class
deleted file mode 100644
index 1068e7c..0000000
--- a/server/service/target/classes/com/doumee/service/business/InterfaceLogService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/MemberService.class b/server/service/target/classes/com/doumee/service/business/MemberService.class
deleted file mode 100644
index 20ed4b6..0000000
--- a/server/service/target/classes/com/doumee/service/business/MemberService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/MultifileService.class b/server/service/target/classes/com/doumee/service/business/MultifileService.class
deleted file mode 100644
index 698ac5c..0000000
--- a/server/service/target/classes/com/doumee/service/business/MultifileService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/NewsService.class b/server/service/target/classes/com/doumee/service/business/NewsService.class
deleted file mode 100644
index 6efc51f..0000000
--- a/server/service/target/classes/com/doumee/service/business/NewsService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/SegmentsService.class b/server/service/target/classes/com/doumee/service/business/SegmentsService.class
deleted file mode 100644
index d0251e4..0000000
--- a/server/service/target/classes/com/doumee/service/business/SegmentsService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/ShopService.class b/server/service/target/classes/com/doumee/service/business/ShopService.class
deleted file mode 100644
index fb2758d..0000000
--- a/server/service/target/classes/com/doumee/service/business/ShopService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/UsersService.class b/server/service/target/classes/com/doumee/service/business/UsersService.class
deleted file mode 100644
index 72d83d9..0000000
--- a/server/service/target/classes/com/doumee/service/business/UsersService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/ActionsServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/ActionsServiceImpl.class
deleted file mode 100644
index b6df17c..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/ActionsServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/BjParamServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/BjParamServiceImpl.class
deleted file mode 100644
index 6aa9633..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/BjParamServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/CategorySegServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/CategorySegServiceImpl.class
deleted file mode 100644
index be3292a..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/CategorySegServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/CategoryServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/CategoryServiceImpl.class
deleted file mode 100644
index 7aac050..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/CategoryServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.class
deleted file mode 100644
index 56b0170..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/CustomerLogServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/CustomerLogServiceImpl.class
deleted file mode 100644
index 5cd2f58..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/CustomerLogServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/CustomerServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/CustomerServiceImpl.class
deleted file mode 100644
index 69b7b5e..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/CustomerServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/IamInterfaceLogServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/IamInterfaceLogServiceImpl.class
deleted file mode 100644
index 8efa265..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/IamInterfaceLogServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/InterfaceLogServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/InterfaceLogServiceImpl.class
deleted file mode 100644
index cef799b..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/InterfaceLogServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/MemberServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/MemberServiceImpl.class
deleted file mode 100644
index cd33d21..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/MemberServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/MultifileServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/MultifileServiceImpl.class
deleted file mode 100644
index b159756..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/MultifileServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/NewsServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/NewsServiceImpl.class
deleted file mode 100644
index 19f66bf..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/NewsServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/SegmentsServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/SegmentsServiceImpl.class
deleted file mode 100644
index 1f84829..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/SegmentsServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/ShopServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/ShopServiceImpl.class
deleted file mode 100644
index 4bd3675..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/ShopServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/business/impl/UsersServiceImpl.class b/server/service/target/classes/com/doumee/service/business/impl/UsersServiceImpl.class
deleted file mode 100644
index 5205d30..0000000
--- a/server/service/target/classes/com/doumee/service/business/impl/UsersServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/common/CaptchaService$Captcha.class b/server/service/target/classes/com/doumee/service/common/CaptchaService$Captcha.class
deleted file mode 100644
index de4b0b2..0000000
--- a/server/service/target/classes/com/doumee/service/common/CaptchaService$Captcha.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/common/CaptchaService.class b/server/service/target/classes/com/doumee/service/common/CaptchaService.class
deleted file mode 100644
index 0eba064..0000000
--- a/server/service/target/classes/com/doumee/service/common/CaptchaService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/common/tree/CompanyTree.class b/server/service/target/classes/com/doumee/service/common/tree/CompanyTree.class
deleted file mode 100644
index 759c595..0000000
--- a/server/service/target/classes/com/doumee/service/common/tree/CompanyTree.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/proxy/CacheProxy.class b/server/service/target/classes/com/doumee/service/proxy/CacheProxy.class
deleted file mode 100644
index 68df042..0000000
--- a/server/service/target/classes/com/doumee/service/proxy/CacheProxy.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemDataPermissionService.class b/server/service/target/classes/com/doumee/service/system/SystemDataPermissionService.class
deleted file mode 100644
index 75a58f5..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemDataPermissionService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemDepartmentService.class b/server/service/target/classes/com/doumee/service/system/SystemDepartmentService.class
deleted file mode 100644
index b8fc3e0..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemDepartmentService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemDepartmentUserService.class b/server/service/target/classes/com/doumee/service/system/SystemDepartmentUserService.class
deleted file mode 100644
index 4ed35db..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemDepartmentUserService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemDictDataService.class b/server/service/target/classes/com/doumee/service/system/SystemDictDataService.class
deleted file mode 100644
index 45b19de..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemDictDataService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemDictService.class b/server/service/target/classes/com/doumee/service/system/SystemDictService.class
deleted file mode 100644
index 4583372..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemDictService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemLoginLogService.class b/server/service/target/classes/com/doumee/service/system/SystemLoginLogService.class
deleted file mode 100644
index 58177d7..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemLoginLogService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemLoginService.class b/server/service/target/classes/com/doumee/service/system/SystemLoginService.class
deleted file mode 100644
index 2cbd4c5..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemLoginService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemMenuService.class b/server/service/target/classes/com/doumee/service/system/SystemMenuService.class
deleted file mode 100644
index 96ea2ee..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemMenuService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemPermissionService.class b/server/service/target/classes/com/doumee/service/system/SystemPermissionService.class
deleted file mode 100644
index 85f4492..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemPermissionService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemPositionService.class b/server/service/target/classes/com/doumee/service/system/SystemPositionService.class
deleted file mode 100644
index ec519b0..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemPositionService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemPositionUserService.class b/server/service/target/classes/com/doumee/service/system/SystemPositionUserService.class
deleted file mode 100644
index 275afaa..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemPositionUserService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemRoleMenuService.class b/server/service/target/classes/com/doumee/service/system/SystemRoleMenuService.class
deleted file mode 100644
index 1c523fb..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemRoleMenuService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemRolePermissionService.class b/server/service/target/classes/com/doumee/service/system/SystemRolePermissionService.class
deleted file mode 100644
index 152c260..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemRolePermissionService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemRoleService.class b/server/service/target/classes/com/doumee/service/system/SystemRoleService.class
deleted file mode 100644
index e274250..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemRoleService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemTraceLogService.class b/server/service/target/classes/com/doumee/service/system/SystemTraceLogService.class
deleted file mode 100644
index 4667fea..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemTraceLogService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemUserRoleService.class b/server/service/target/classes/com/doumee/service/system/SystemUserRoleService.class
deleted file mode 100644
index 81c2607..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemUserRoleService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/SystemUserService.class b/server/service/target/classes/com/doumee/service/system/SystemUserService.class
deleted file mode 100644
index f139e5a..0000000
--- a/server/service/target/classes/com/doumee/service/system/SystemUserService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.class
deleted file mode 100644
index 9cb597f..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemDepartmentServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemDepartmentServiceImpl.class
deleted file mode 100644
index 5c52c83..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemDepartmentServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemDepartmentUserServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemDepartmentUserServiceImpl.class
deleted file mode 100644
index 6d2c04d..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemDepartmentUserServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemDictDataServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemDictDataServiceImpl.class
deleted file mode 100644
index 10d65d5..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemDictDataServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemDictServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemDictServiceImpl.class
deleted file mode 100644
index e8a8d07..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemDictServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemLoginLogServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemLoginLogServiceImpl.class
deleted file mode 100644
index 180ef58..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemLoginLogServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemLoginServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemLoginServiceImpl.class
deleted file mode 100644
index e562488..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemLoginServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemMenuServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemMenuServiceImpl.class
deleted file mode 100644
index c30a041..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemMenuServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemPermissionServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemPermissionServiceImpl.class
deleted file mode 100644
index f7432d7..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemPermissionServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemPositionServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemPositionServiceImpl.class
deleted file mode 100644
index 4ed617b..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemPositionServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemPositionUserServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemPositionUserServiceImpl.class
deleted file mode 100644
index 3af0adb..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemPositionUserServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.class
deleted file mode 100644
index e6d8f04..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemRoleMenuServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.class
deleted file mode 100644
index d198854..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemRolePermissionServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemRoleServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemRoleServiceImpl.class
deleted file mode 100644
index bd741b1..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemRoleServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemTraceLogServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemTraceLogServiceImpl.class
deleted file mode 100644
index cc29bb3..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemTraceLogServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemUserRoleServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemUserRoleServiceImpl.class
deleted file mode 100644
index 4983a3a..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemUserRoleServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/system/impl/SystemUserServiceImpl.class b/server/service/target/classes/com/doumee/service/system/impl/SystemUserServiceImpl.class
deleted file mode 100644
index c1b880e..0000000
--- a/server/service/target/classes/com/doumee/service/system/impl/SystemUserServiceImpl.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/timer/QuartzJobService.class b/server/service/target/classes/com/doumee/service/timer/QuartzJobService.class
deleted file mode 100644
index fe034af..0000000
--- a/server/service/target/classes/com/doumee/service/timer/QuartzJobService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/timer/QuartzLogService.class b/server/service/target/classes/com/doumee/service/timer/QuartzLogService.class
deleted file mode 100644
index 0d7ad5e..0000000
--- a/server/service/target/classes/com/doumee/service/timer/QuartzLogService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/zbom/ZbomIAMService.class b/server/service/target/classes/com/doumee/service/zbom/ZbomIAMService.class
deleted file mode 100644
index d30cdce..0000000
--- a/server/service/target/classes/com/doumee/service/zbom/ZbomIAMService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/com/doumee/service/zbom/ZbomZhongTaiService.class b/server/service/target/classes/com/doumee/service/zbom/ZbomZhongTaiService.class
deleted file mode 100644
index 6d02f25..0000000
--- a/server/service/target/classes/com/doumee/service/zbom/ZbomZhongTaiService.class
+++ /dev/null
Binary files differ
diff --git a/server/service/target/classes/mappers/SystemDataPermissionMapper.xml b/server/service/target/classes/mappers/SystemDataPermissionMapper.xml
deleted file mode 100644
index 13f821f..0000000
--- a/server/service/target/classes/mappers/SystemDataPermissionMapper.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.doumee.dao.system.SystemDataPermissionMapper">
-
- <!-- 鏌ヨ閮ㄩ棬鍒楄〃 -->
- <resultMap id="SystemDataPermissionListVO" type="com.doumee.dao.system.vo.SystemDataPermissionListVO" autoMapping="true">
- <id column="ID" property="id"/>
- <association property="role" javaType="com.doumee.dao.system.model.SystemRole">
- <result column="ROLE_ID" property="id"/>
- <result column="ROLE_CODE" property="code"/>
- <result column="ROLE_NAME" property="name"/>
- </association>
- <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="CREATE_USER_ID" property="id"/>
- <result column="CREATE_USER_NAME" property="username"/>
- </association>
- <association property="updateUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="UPDATE_USER_ID" property="id"/>
- <result column="UPDATE_USER_NAME" property="username"/>
- </association>
- </resultMap>
- <select id="selectManageList" resultMap="SystemDataPermissionListVO">
- SELECT
- sdp.`ID`, sdp.`BUSINESS_CODE`, sdp.`ROLE_ID`, sdp.`TYPE`, sdp.`CUSTOM_DATA`, sdp.`DISABLED`, sdp.`REMARK`, sdp.DISABLED, sdp.`CREATE_TIME`, sdp.`UPDATE_TIME`,
- role.`ID` AS ROLE_ID, role.`CODE` AS ROLE_CODE, role.`NAME` AS ROLE_NAME,
- create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
- FROM SYSTEM_DATA_PERMISSION sdp
- INNER JOIN `SYSTEM_ROLE` role ON role.ID = sdp.ROLE_ID
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = sdp.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = sdp.UPDATE_USER
- <where>
- sdp.DELETED = 0
- <if test="dto.businessCode != null and dto.businessCode != ''">
- AND sdp.`BUSINESS_CODE` = #{dto.businessCode}
- </if>
- <if test="dto.roleId != null">
- AND role.`ID` = #{dto.roleId}
- </if>
- <if test="dto.type != null">
- AND sdp.`TYPE` = #{dto.type}
- </if>
- </where>
- ${orderByClause}
- </select>
-
-</mapper>
diff --git a/server/service/target/classes/mappers/SystemDepartmentMapper.xml b/server/service/target/classes/mappers/SystemDepartmentMapper.xml
deleted file mode 100644
index 0a57944..0000000
--- a/server/service/target/classes/mappers/SystemDepartmentMapper.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.doumee.dao.system.SystemDepartmentMapper">
-
- <!-- 鏌ヨ閮ㄩ棬鍒楄〃 -->
- <resultMap id="SystemDepartmentListVO" type="com.doumee.dao.system.vo.SystemDepartmentListVO" autoMapping="true">
- <id column="ID" property="id"/>
- <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="CREATE_USER_ID" property="id"/>
- <result column="CREATE_USER_NAME" property="username"/>
- </association>
- <association property="updateUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="UPDATE_USER_ID" property="id"/>
- <result column="UPDATE_USER_NAME" property="username"/>
- </association>
- </resultMap>
- <select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemDepartmentDTO" resultMap="SystemDepartmentListVO">
- SELECT
- dept.`ID`, dept.`PARENT_ID`, dept.`CODE`, dept.`NAME`, dept.`PHONE`, dept.`EMAIL`, dept.`CREATE_TIME`, dept.`UPDATE_TIME`, dept.`CREATE_USER`, dept.`UPDATE_USER`, dept.`DELETED`,
- create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME,
- COUNT(usr.ID) USER_COUNT
- FROM SYSTEM_DEPARTMENT dept
- LEFT JOIN `SYSTEM_DEPARTMENT_USER` sdu ON sdu.DEPARTMENT_ID = dept.ID AND sdu.DELETED = 0
- LEFT JOIN `SYSTEM_USER` usr ON usr.ID = sdu.USER_ID AND usr.DELETED = 0
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = dept.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = dept.UPDATE_USER
- <where>
- dept.DELETED = 0
- <if test="id != null">
- AND dept.ID = #{id}
- </if>
- <if test="ids != null">
- AND dept.ID IN
- <foreach collection="ids" item="id" separator="," open="(" close=")">
- #{id}
- </foreach>
- </if>
- </where>
- GROUP BY dept.`ID`
- </select>
-
-</mapper>
diff --git a/server/service/target/classes/mappers/SystemDictDataMapper.xml b/server/service/target/classes/mappers/SystemDictDataMapper.xml
deleted file mode 100644
index ae3a515..0000000
--- a/server/service/target/classes/mappers/SystemDictDataMapper.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.doumee.dao.system.SystemDictDataMapper">
-
- <!-- 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 -->
- <resultMap id="SystemDictDataListVO" type="com.doumee.dao.system.vo.SystemDictDataListVO" autoMapping="true">
- <id column="ID" property="id"/>
- <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="CREATE_USER_ID" property="id"/>
- <result column="CREATE_USER_NAME" property="username"/>
- </association>
- <association property="updateUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="UPDATE_USER_ID" property="id"/>
- <result column="UPDATE_USER_NAME" property="username"/>
- </association>
- </resultMap>
- <select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemDictDataDTO" resultMap="SystemDictDataListVO">
- SELECT
- dict_data.`ID`, dict_data.`DICT_ID`, dict_data.`CODE`, dict_data.`LABEL`, dict_data.`SORT`, dict_data.`DISABLED`, dict_data.`CREATE_TIME`, dict_data.`UPDATE_TIME`, dict_data.`CREATE_USER`, dict_data.`UPDATE_USER`,
- create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
- FROM SYSTEM_DICT_DATA dict_data
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = dict_data.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = dict_data.UPDATE_USER
- <where>
- dict_data.DELETED = 0
- <if test="dictId != null">
- AND dict_data.`DICT_ID` = #{dictId}
- </if>
- </where>
- </select>
- <select id="list" resultType="com.doumee.dao.system.vo.SystemDictDataListVO">
- SELECT
- dict_data.`ID`, dict_data.`DICT_ID`, dict_data.`CODE`, dict_data.`LABEL`
- FROM SYSTEM_DICT_DATA dict_data
- <where>
- dict_data.DELETED = 0
- <if test="codes != null and codes.size > 0">
- AND dict_data.`LABEL` in
- <foreach collection="codes" index="index" item="code" open="(" separator="," close=")">
- #{code}
- </foreach>
- </if>
- </where>
- </select>
-
-</mapper>
diff --git a/server/service/target/classes/mappers/SystemDictMapper.xml b/server/service/target/classes/mappers/SystemDictMapper.xml
deleted file mode 100644
index 76338cb..0000000
--- a/server/service/target/classes/mappers/SystemDictMapper.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.doumee.dao.system.SystemDictMapper">
-
- <!-- 鏌ヨ瀛楀吀鍒楄〃 -->
- <resultMap id="SystemDictListVO" type="com.doumee.dao.system.vo.SystemDictListVO" autoMapping="true">
- <id column="ID" property="id"/>
- <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="CREATE_USER_ID" property="id"/>
- <result column="CREATE_USER_NAME" property="username"/>
- </association>
- <association property="updateUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="UPDATE_USER_ID" property="id"/>
- <result column="UPDATE_USER_NAME" property="username"/>
- </association>
- </resultMap>
- <select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemDictDTO" resultMap="SystemDictListVO">
- SELECT
- dict.`ID`, dict.`CODE`, dict.`NAME`, dict.`REMARK`, dict.`CREATE_TIME`, dict.`UPDATE_TIME`, dict.`CREATE_USER`, dict.`UPDATE_USER`,
- create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
- FROM SYSTEM_DICT dict
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = dict.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = dict.UPDATE_USER
- <where>
- dict.DELETED = 0
- <if test="dto.code != null and dto.code != ''">
- AND dict.`CODE` LIKE concat('%', #{dto.code}, '%')
- </if>
- <if test="dto.name != null and dto.name != ''">
- AND dict.`NAME` LIKE concat('%', #{dto.name}, '%')
- </if>
- </where>
- ${orderByClause}
- </select>
-
-</mapper>
diff --git a/server/service/target/classes/mappers/SystemMenuMapper.xml b/server/service/target/classes/mappers/SystemMenuMapper.xml
deleted file mode 100644
index 0ec9ada..0000000
--- a/server/service/target/classes/mappers/SystemMenuMapper.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.doumee.dao.system.SystemMenuMapper">
-
- <!-- 鏌ヨ鑿滃崟鍒楄〃 -->
- <resultMap id="SystemMenuListVO" type="com.doumee.dao.system.vo.SystemMenuListVO" autoMapping="true">
- <id column="ID" property="id"/>
- <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="CREATE_USER_ID" property="id"/>
- <result column="CREATE_USER_NAME" property="username"/>
- </association>
- <association property="updateUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="UPDATE_USER_ID" property="id"/>
- <result column="UPDATE_USER_NAME" property="username"/>
- </association>
- </resultMap>
- <select id="selectManageList" resultMap="SystemMenuListVO">
- SELECT
- menu.`ID`, menu.`PARENT_ID`, menu.`NAME`, menu.`PATH`, menu.`FIXED`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`,
- create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
- FROM SYSTEM_MENU menu
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = menu.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = menu.UPDATE_USER
- <where>
- menu.DELETED = 0
- </where>
- ORDER BY menu.SORT
- </select>
-
- <!-- 鏌ヨ鑿滃崟鏍� -->
- <select id="selectByUserId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemMenu">
- SELECT
- DISTINCT menu.`ID`, menu.`PARENT_ID`, menu.`NAME`, menu.`PATH`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`
- FROM `SYSTEM_MENU` menu
- INNER JOIN SYSTEM_ROLE_MENU role_menu ON role_menu.MENU_ID = menu.ID AND role_menu.DELETED = 0
- INNER JOIN SYSTEM_USER_ROLE user_role ON user_role.ROLE_ID = role_menu.ROLE_ID AND user_role.DELETED = 0
- <where>
- AND menu.DELETED = 0
- AND menu.DISABLED = 0
- AND user_role.USER_ID = #{userId}
- </where>
- ORDER BY menu.SORT
- </select>
-
- <!-- 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鍒楄〃 -->
- <select id="selectByRoleId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemMenu">
- SELECT
- menu.`ID`, menu.`PARENT_ID`, menu.`NAME`, menu.`PATH`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`
- FROM `SYSTEM_MENU` menu
- INNER JOIN `SYSTEM_ROLE_MENU` role_menu ON role_menu.MENU_ID = menu.ID AND role_menu.DELETED = 0
- <where>
- menu.DELETED = 0
- AND role_menu.ROLE_ID = #{roleId}
- </where>
- </select>
-
-</mapper>
diff --git a/server/service/target/classes/mappers/SystemPermissionMapper.xml b/server/service/target/classes/mappers/SystemPermissionMapper.xml
deleted file mode 100644
index 9568ef5..0000000
--- a/server/service/target/classes/mappers/SystemPermissionMapper.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.doumee.dao.system.SystemPermissionMapper">
-
- <!-- 鏌ヨ绯荤粺鏉冮檺鍒楄〃 -->
- <resultMap id="SystemPermissionListVO" type="com.doumee.dao.system.vo.SystemPermissionListVO" autoMapping="true">
- <id column="ID" property="id"/>
- <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <id column="CREATE_USER_ID" property="id"/>
- <result column="CREATE_USER_NAME" property="username"/>
- </association>
- <association property="updateUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <id column="UPDATE_USER_ID" property="id"/>
- <result column="UPDATE_USER_NAME" property="username"/>
- </association>
- </resultMap>
- <select id="selectManageList" resultMap="SystemPermissionListVO">
- SELECT
- perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`FIXED`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`,
- create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
- FROM SYSTEM_PERMISSION perm
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = perm.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = perm.UPDATE_USER
- <where>
- perm.DELETED = 0
- <if test="dto.code != null">
- AND perm.CODE LIKE CONCAT('%', #{dto.code}, '%')
- </if>
- <if test="dto.name != null">
- AND perm.`NAME` LIKE CONCAT('%', #{dto.name}, '%')
- </if>
- </where>
- ${orderByClause}
- </select>
-
- <!-- 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺 -->
- <select id="selectByUserId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemPermission">
- SELECT
- perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`
- FROM SYSTEM_PERMISSION perm
- INNER JOIN SYSTEM_ROLE_PERMISSION role_perm ON role_perm.PERMISSION_ID = perm.ID AND role_perm.DELETED = 0
- INNER JOIN SYSTEM_ROLE role ON role.ID = role_perm.ROLE_ID AND role.DELETED = 0
- INNER JOIN SYSTEM_USER_ROLE user_role ON user_role.ROLE_ID = role.ID AND user_role.DELETED = 0
- <where>
- perm.DELETED = 0
- AND user_role.USER_ID = #{userId}
- </where>
- </select>
-
- <!-- 鏍规嵁瑙掕壊ID鏌ヨ鏉冮檺 -->
- <select id="selectByRoleId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemPermission">
- SELECT
- perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`
- FROM SYSTEM_PERMISSION perm
- INNER JOIN SYSTEM_ROLE_PERMISSION role_perm ON role_perm.PERMISSION_ID = perm.ID AND role_perm.DELETED = 0
- <where>
- perm.DELETED = 0
- AND role_perm.ROLE_ID = #{roleId}
- </where>
- </select>
-
-</mapper>
diff --git a/server/service/target/classes/mappers/SystemPositionMapper.xml b/server/service/target/classes/mappers/SystemPositionMapper.xml
deleted file mode 100644
index fc15235..0000000
--- a/server/service/target/classes/mappers/SystemPositionMapper.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.doumee.dao.system.SystemPositionMapper">
-
- <!-- 鏌ヨ宀椾綅鍒楄〃 -->
- <resultMap id="SystemPositionListVO" type="com.doumee.dao.system.vo.SystemPositionListVO" autoMapping="true">
- <id column="ID" property="id"/>
- <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="CREATE_USER_ID" property="id"/>
- <result column="CREATE_USER_NAME" property="username"/>
- </association>
- <association property="updateUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="UPDATE_USER_ID" property="id"/>
- <result column="UPDATE_USER_NAME" property="username"/>
- </association>
- </resultMap>
- <select id="selectManageList" resultMap="SystemPositionListVO">
- SELECT
- posi.`ID`, posi.`PARENT_ID`, posi.`CODE`, posi.`NAME`, posi.`CREATE_TIME`, posi.`UPDATE_TIME`, posi.`CREATE_USER`, posi.`UPDATE_USER`,
- create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME,
- COUNT(usr.ID) USER_COUNT
- FROM SYSTEM_POSITION posi
- LEFT JOIN `SYSTEM_POSITION_USER` spu ON spu.POSITION_ID = posi.ID AND spu.DELETED = 0
- LEFT JOIN `SYSTEM_USER` usr ON usr.ID = spu.USER_ID AND usr.DELETED = 0
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = posi.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = posi.UPDATE_USER
- <where>
- posi.DELETED = 0
- <if test="name != null and name != ''">
- AND posi.`NAME` LIKE concat('%', #{name}, '%')
- </if>
- </where>
- GROUP BY posi.`ID`
- </select>
-
- <!-- 鏌ヨ鐢ㄦ埛宀椾綅鍒楄〃 -->
- <select id="selectByUserId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemPosition">
- SELECT
- sp.`ID`, sp.`PARENT_ID`, sp.`CODE`, sp.`NAME`
- FROM `SYSTEM_POSITION` sp
- INNER JOIN `SYSTEM_POSITION_USER` spu ON spu.`POSITION_ID` = sp.`ID` AND spu.`DELETED` = 0
- INNER JOIN `SYSTEM_USER` su ON su.`ID` = spu.`USER_ID`
- <where>
- sp.DELETED = 0
- AND spu.USER_ID = #{userId}
- </where>
- </select>
-</mapper>
diff --git a/server/service/target/classes/mappers/SystemRoleMapper.xml b/server/service/target/classes/mappers/SystemRoleMapper.xml
deleted file mode 100644
index e2851b9..0000000
--- a/server/service/target/classes/mappers/SystemRoleMapper.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.doumee.dao.system.SystemRoleMapper">
-
- <!-- 鏌ヨ瑙掕壊鍒楄〃 -->
- <resultMap id="SystemRoleListVO" type="com.doumee.dao.system.vo.SystemRoleListVO" autoMapping="true">
- <id column="ID" property="id"/>
- <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <id column="CREATE_USER_ID" property="id"/>
- <result column="CREATE_USER_NAME" property="username"/>
- </association>
- <association property="updateUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <id column="UPDATE_USER_ID" property="id"/>
- <result column="UPDATE_USER_NAME" property="username"/>
- </association>
- </resultMap>
- <select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemUserDTO" resultMap="SystemRoleListVO">
- SELECT
- role.ID, role.`CODE`, role.`NAME`, role.`REMARK`, role.`FIXED`, role.`CREATE_TIME`, role.`UPDATE_TIME`,
- create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
- FROM SYSTEM_ROLE role
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = role.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = role.UPDATE_USER
- <where>
- role.DELETED = 0
- <if test="dto.code != null and dto.code != ''">
- AND role.`CODE` LIKE CONCAT('%', #{dto.code}, '%')
- </if>
- <if test="dto.name != null and dto.name != ''">
- AND role.`NAME` LIKE CONCAT('%', #{dto.name}, '%')
- </if>
- </where>
- ${orderByClause}
- </select>
-
- <!-- 鏌ヨ鐢ㄦ埛瑙掕壊鍒楄〃 -->
- <select id="selectByUserId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemRole">
- SELECT
- role.ID, role.`CODE`, role.`NAME`, role.`REMARK`, role.`CREATE_TIME`, role.`UPDATE_TIME`
- FROM SYSTEM_ROLE role
- INNER JOIN SYSTEM_USER_ROLE user_role ON user_role.ROLE_ID = role.ID AND user_role.DELETED = 0
- <where>
- role.DELETED = 0
- AND user_role.USER_ID = #{userId}
- </where>
- </select>
-
-</mapper>
diff --git a/server/service/target/classes/mappers/SystemUserMapper.xml b/server/service/target/classes/mappers/SystemUserMapper.xml
deleted file mode 100644
index 78d68d6..0000000
--- a/server/service/target/classes/mappers/SystemUserMapper.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.doumee.dao.system.SystemUserMapper">
-
- <!-- 鏌ヨ鐢ㄦ埛鍒楄〃 -->
- <resultMap id="SystemUserListVO" type="com.doumee.dao.system.vo.SystemUserListVO" autoMapping="true">
- <id column="ID" property="id"/>
- <association property="department" javaType="com.doumee.dao.system.model.SystemDepartment">
- <result column="DEPARTMENT_ID" property="id"/>
- <result column="DEPARTMENT_NAME" property="name"/>
- </association>
- <association property="createUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="CREATE_USER_ID" property="id"/>
- <result column="CREATE_USER_NAME" property="username"/>
- <result column="CREATE_REAL_NAME" property="realname"/>
- </association>
- <association property="updateUserInfo" javaType="com.doumee.dao.system.model.SystemUser">
- <result column="UPDATE_USER_ID" property="id"/>
- <result column="UPDATE_USER_NAME" property="username"/>
- <result column="UPDATE_REAL_NAME" property="realname"/>
- </association>
- </resultMap>
- <select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemUserDTO" resultMap="SystemUserListVO">
- SELECT
- DISTINCT
- usr.ID, usr.BIRTHDAY, usr.EMAIL, usr.EMP_NO, usr.MOBILE, usr.AVATAR, usr.USERNAME, usr.REALNAME, usr.SEX, usr.FIXED, usr.CREATE_TIME, usr.UPDATE_TIME,
- sd.ID AS DEPARTMENT_ID, sd.`NAME` AS DEPARTMENT_NAME,usr.wechat_name,usr.status,usr.OPENID,usr.type,
- create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME, create_user.`REALNAME` CREATE_REAL_NAME,
- update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME
- FROM `SYSTEM_USER` usr
- LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = usr.CREATE_USER
- LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = usr.UPDATE_USER
--- LEFT JOIN `SYSTEM_POSITION_USER` spu ON spu.USER_ID = usr.ID AND spu.DELETED = 0
--- LEFT JOIN `SYSTEM_POSITION` sp ON sp.ID = spu.POSITION_ID AND sp.DELETED = 0
- LEFT JOIN `SYSTEM_DEPARTMENT_USER` sdu ON sdu.USER_ID = usr.ID AND sdu.DELETED = 0
- LEFT JOIN `SYSTEM_DEPARTMENT` sd ON sd.ID = sdu.DEPARTMENT_ID AND sd.DELETED = 0
- <if test="dto.roleId != null">
- RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.ROLE_ID = #{dto.roleId}
- </if>
- <where>
- usr.DELETED = 0
-<!-- <if test="dto.positionId != null">-->
-<!-- AND spu.POSITION_ID = #{dto.positionId}-->
-<!-- </if>-->
- <if test="dto.strictDeptId != null">
- AND sdu.DEPARTMENT_ID = #{dto.strictDeptId}
- </if>
- <if test="dto.departmentIds != null and dto.departmentIds.size > 0">
- AND sdu.DEPARTMENT_ID IN
- <foreach collection="dto.departmentIds" open="(" close=")" separator="," item="id">
- #{id}
- </foreach>
- </if>
- <if test="dto.username != null and dto.username != ''">
- AND usr.`USERNAME` LIKE CONCAT('%', #{dto.username}, '%')
- </if>
- <if test="dto.realname != null and dto.realname != ''">
- AND usr.`REALNAME` LIKE CONCAT('%', #{dto.realname}, '%')
- </if>
- <if test="dto.mobile != null and dto.mobile != ''">
- AND usr.`MOBILE` LIKE CONCAT('%', #{dto.mobile}, '%')
- </if>
- <if test="dto.status != null ">
- AND usr.`status` = #{dto.status}
- </if>
- </where>
- ${orderByClause}
- </select>
-
-</mapper>
diff --git a/server/web/src/main/java/com/doumee/api/web/ApiController.java b/server/web/src/main/java/com/doumee/api/web/ApiController.java
index 0191920..7a5bf06 100644
--- a/server/web/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/web/src/main/java/com/doumee/api/web/ApiController.java
@@ -1,7 +1,9 @@
package com.doumee.api.web;
import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.dao.business.model.Member;
import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.ptg.MemAreaPtg;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -26,4 +28,15 @@
return request;
}
+
+ /**
+ * 鑾峰彇鐢ㄦ埛ID
+ *
+ * @return
+ */
+ protected Long getMemberId() {
+ Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserId_Name);
+ return obj != null ? (Long) obj : null;
+ }
+
}
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
new file mode 100644
index 0000000..3dbee62
--- /dev/null
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -0,0 +1,101 @@
+package com.doumee.api.web;
+
+import com.doumee.config.annotation.LoginRequired;
+import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.web.reqeust.EditMemberRequest;
+import com.doumee.dao.web.reqeust.WxPhoneRequest;
+import com.doumee.dao.web.response.AccountResponse;
+import com.doumee.dao.web.response.BjParamConfigResponse;
+import com.doumee.service.business.BjParamService;
+import com.doumee.service.business.CustomerService;
+import com.doumee.service.business.MemberService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/7/10 14:03
+ */
+@Api(tags = "瀹㈡埛绔皬绋嬪簭鐢ㄦ埛涓氬姟")
+@Trace(exclude = true)
+@RestController
+@RequestMapping("/web/customer")
+@Slf4j
+public class CustomerApi extends ApiController{
+
+
+ @Autowired
+ private MemberService memberService;
+
+ @Autowired
+ private BjParamService bjParamService;
+
+ @Autowired
+ private CustomerService customerService;
+
+
+ @ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/wxLoginCustomer")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
+ })
+ public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code) {
+ return ApiResponse.success(memberService.wxLogin(code));
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鑾峰彇鎵嬫満鍙�", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getWxMiniPhone")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse getWxMiniPhone(@Valid @RequestBody WxPhoneRequest wxPhoneRequest) {
+ return ApiResponse.success("鑾峰彇鎴愬姛",memberService.getWxMiniPhone(wxPhoneRequest));
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鏇存柊涓汉淇℃伅", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/editMember")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse updMemberDetail(@RequestBody EditMemberRequest editMemberRequest) {
+ editMemberRequest.setMemberId(getMemberId());
+ memberService.updMemberDetail(editMemberRequest);
+ return ApiResponse.success("鏇存柊鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鑾峰彇涓汉淇℃伅", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getMemberInfo")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<Member> getMemberInfo() {
+ return ApiResponse.success("鑾峰彇鎴愬姛",memberService.getMemberInfo(getMemberId()));
+ }
+
+
+ @ApiOperation(value = "鑾峰彇鎶ヤ环閰嶇疆", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getBjParamConfig")
+ public ApiResponse<BjParamConfigResponse> getBjParamConfig() {
+ return ApiResponse.success(bjParamService.getBjParamConfig());
+ }
+
+
+
+
+
+
+}
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
new file mode 100644
index 0000000..cce994c
--- /dev/null
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -0,0 +1,69 @@
+package com.doumee.api.web;
+
+import com.doumee.config.annotation.UserLoginRequired;
+import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.dao.web.response.AccountResponse;
+import com.doumee.service.business.MemberService;
+import com.doumee.service.business.UsersService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/7/10 18:06
+ */
+@Api(tags = "鍛樺伐绔皬绋嬪簭鐢ㄦ埛涓氬姟")
+@Trace(exclude = true)
+@RestController
+@RequestMapping("/web/personnel")
+@Slf4j
+public class PersonnelApi extends ApiController{
+
+ @Autowired
+ public UsersService usersService;
+
+
+ @ApiOperation(value = "灏忕▼搴忕櫥闄�", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/loginByWx")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
+ })
+ public ApiResponse<AccountResponse> loginByWx(@RequestParam String code) {
+ return ApiResponse.success(usersService.wxLogin(code));
+ }
+
+
+ @ApiOperation(value = "鎵嬫満鍙烽獙璇佺爜鐧婚檰", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/loginByPhone")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "鎵嬫満鍙�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "鐭俊楠岃瘉鐮�", required = true),
+ })
+ public ApiResponse<AccountResponse> loginByPhone(@RequestParam String phone,@RequestParam String code) {
+ return ApiResponse.success(usersService.phoneLogin(phone,code));
+ }
+
+
+ @UserLoginRequired
+ @ApiOperation(value = "缁戝畾openid", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/bindingOpenid")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
+ })
+ public ApiResponse bindingOpenid(@RequestParam String code) {
+ usersService.bindingOpenid(code,getMemberId());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+}
diff --git a/server/web/target/classes/application.yml b/server/web/target/classes/application.yml
deleted file mode 100644
index e5d6350..0000000
--- a/server/web/target/classes/application.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-# 椤圭洰淇℃伅閰嶇疆
-project:
- name: 鏅鸿兘浼氳瀹ゅ皬绋嬪簭绔�
- version: 1.0.0
- env: development
-# env: production
-
-
-spring:
- # application:
- # name: doumee
- profiles:
- active: dev
-
- # JSON杩斿洖閰嶇疆
- jackson:
- # 榛樿鏃跺尯
- time-zone: GMT+8
- # 榛樿鏃ユ湡鏍煎紡鍖�
- date-format: yyyy-MM-dd HH:mm:ss
- servlet:
- multipart:
- max-file-size: 200MB
- max-request-size: 200MB
- enabled: true
-# MyBatis閰嶇疆
-mybatis-plus:
- mapper-locations: classpath*:/mappers/**/*.xml
- configuration:
- map-underscore-to-camel-case: true
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-
-# 缂撳瓨鍐呭璁剧疆
-cache:
- session:
- # 浼氳瘽杩囨湡鏃堕暱(s)
- expire: 18000
- captcha:
- # 楠岃瘉鐮佽繃鏈熸椂闀�(s)
- expire: 300
-
-# 璺熻釜鏃ュ織
-trace:
- # 寮�鍚櫤鑳借窡韪ā寮�
- smart: true
- # 鎺掗櫎璺熻釜鐨刄RL姝ｅ垯
- exclude-patterns: .+/list[a-zA-Z0-9\-\_]*$, .+/tree[a-zA-Z0-9\-\_]*$, .+/page[a-zA-Z0-9\-\_]*$, .+/all[a-zA-Z0-9\-\_]*$, /swagger-resources.*
-
-
-# 鏃ュ織閰嶇疆
-logback:
- level: INFO
- appender: ${project.env}
-# dao灞傜殑鏃ュ織璁剧疆涓篸ebug锛屾柟渚挎煡鐪媠ql
-logging:
- level:
- com.doumee.dao: debug
-
-knife4j:
- enable: true
- basic:
- enable: true
- username: admin
- password: 111111
-
-# WEB鏈嶅姟鍣ㄩ厤缃�
-server:
- compression:
- enabled: true
- mime-types: application/json
-
- port: 10027
- tomcat:
- max-swallow-size: -1
- servlet:
- session:
- timeout: PT3H #琛ㄧず12灏忔椂
\ No newline at end of file
diff --git a/server/web/target/classes/com/doumee/InterfaceApplication.class b/server/web/target/classes/com/doumee/InterfaceApplication.class
deleted file mode 100644
index 6d5707f..0000000
--- a/server/web/target/classes/com/doumee/InterfaceApplication.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/api/BaseController.class b/server/web/target/classes/com/doumee/api/BaseController.class
deleted file mode 100644
index db939c6..0000000
--- a/server/web/target/classes/com/doumee/api/BaseController.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/api/ScheduleTool.class b/server/web/target/classes/com/doumee/api/ScheduleTool.class
deleted file mode 100644
index d3fb0ff..0000000
--- a/server/web/target/classes/com/doumee/api/ScheduleTool.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/api/common/CaptchaController.class b/server/web/target/classes/com/doumee/api/common/CaptchaController.class
deleted file mode 100644
index 462916f..0000000
--- a/server/web/target/classes/com/doumee/api/common/CaptchaController.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/api/web/ApiController.class b/server/web/target/classes/com/doumee/api/web/ApiController.class
deleted file mode 100644
index 42839f6..0000000
--- a/server/web/target/classes/com/doumee/api/web/ApiController.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/api/web/PublicController.class b/server/web/target/classes/com/doumee/api/web/PublicController.class
deleted file mode 100644
index 49a4c4d..0000000
--- a/server/web/target/classes/com/doumee/api/web/PublicController.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/shiro/ShiroAuthFilter.class b/server/web/target/classes/com/doumee/config/shiro/ShiroAuthFilter.class
deleted file mode 100644
index 8ca27a0..0000000
--- a/server/web/target/classes/com/doumee/config/shiro/ShiroAuthFilter.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/shiro/ShiroCache.class b/server/web/target/classes/com/doumee/config/shiro/ShiroCache.class
deleted file mode 100644
index 09e49e9..0000000
--- a/server/web/target/classes/com/doumee/config/shiro/ShiroCache.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/shiro/ShiroCacheManager.class b/server/web/target/classes/com/doumee/config/shiro/ShiroCacheManager.class
deleted file mode 100644
index 2efa336..0000000
--- a/server/web/target/classes/com/doumee/config/shiro/ShiroCacheManager.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/shiro/ShiroConfig.class b/server/web/target/classes/com/doumee/config/shiro/ShiroConfig.class
deleted file mode 100644
index 8a8f380..0000000
--- a/server/web/target/classes/com/doumee/config/shiro/ShiroConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/shiro/ShiroCredentialsMatcher.class b/server/web/target/classes/com/doumee/config/shiro/ShiroCredentialsMatcher.class
deleted file mode 100644
index b3843e1..0000000
--- a/server/web/target/classes/com/doumee/config/shiro/ShiroCredentialsMatcher.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/shiro/ShiroRealm.class b/server/web/target/classes/com/doumee/config/shiro/ShiroRealm.class
deleted file mode 100644
index c0e55ef..0000000
--- a/server/web/target/classes/com/doumee/config/shiro/ShiroRealm.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/shiro/ShiroSessionDAO.class b/server/web/target/classes/com/doumee/config/shiro/ShiroSessionDAO.class
deleted file mode 100644
index b163748..0000000
--- a/server/web/target/classes/com/doumee/config/shiro/ShiroSessionDAO.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/shiro/ShiroSessionManager.class b/server/web/target/classes/com/doumee/config/shiro/ShiroSessionManager.class
deleted file mode 100644
index 154b8bf..0000000
--- a/server/web/target/classes/com/doumee/config/shiro/ShiroSessionManager.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/shiro/ShiroTokenManager.class b/server/web/target/classes/com/doumee/config/shiro/ShiroTokenManager.class
deleted file mode 100644
index 40577a8..0000000
--- a/server/web/target/classes/com/doumee/config/shiro/ShiroTokenManager.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/swagger/SwaggerConfig.class b/server/web/target/classes/com/doumee/config/swagger/SwaggerConfig.class
deleted file mode 100644
index 6bb2dad..0000000
--- a/server/web/target/classes/com/doumee/config/swagger/SwaggerConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/swagger/SwaggerInterceptor.class b/server/web/target/classes/com/doumee/config/swagger/SwaggerInterceptor.class
deleted file mode 100644
index 240f1b0..0000000
--- a/server/web/target/classes/com/doumee/config/swagger/SwaggerInterceptor.class
+++ /dev/null
Binary files differ
diff --git a/server/web/target/classes/com/doumee/config/swagger/SwaggerInterceptorConfig.class b/server/web/target/classes/com/doumee/config/swagger/SwaggerInterceptorConfig.class
deleted file mode 100644
index 6f5592c..0000000
--- a/server/web/target/classes/com/doumee/config/swagger/SwaggerInterceptorConfig.class
+++ /dev/null
Binary files differ
diff --git a/server/web/web.iml b/server/web/web.iml
index f57ca7b..3f494ce 100644
--- a/server/web/web.iml
+++ b/server/web/web.iml
@@ -215,6 +215,20 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.5.8" level="project" />
<orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.17" level="project" />
+ <orderEntry type="library" name="Maven: io.github.x-stream:mxparser:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.11" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
<orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.8.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />
<orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
@@ -262,13 +276,6 @@
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.45.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.45.Final" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.6.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.6.0" level="project" />
- <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11" level="project" />
- <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
- <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.11" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
- <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
<orderEntry type="library" name="Maven: com.auth0:java-jwt:3.4.0" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/server/zbomyoujia.iml b/server/zbomyoujia.iml
index b0dd33b..8de2d75 100644
--- a/server/zbomyoujia.iml
+++ b/server/zbomyoujia.iml
@@ -203,6 +203,20 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.2" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.5.8" level="project" />
<orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
+ <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-miniapp:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.17" level="project" />
+ <orderEntry type="library" name="Maven: io.github.x-stream:mxparser:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.11" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+ <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.3" level="project" />
<orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.8.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />
<orderEntry type="library" name="Maven: org.jdom:jdom:1.1" level="project" />
@@ -250,13 +264,6 @@
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.45.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.45.Final" level="project" />
<orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:3.6.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-common:3.6.0" level="project" />
- <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.11" level="project" />
- <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
- <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.11" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
- <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
<orderEntry type="library" name="Maven: com.auth0:java-jwt:3.4.0" level="project" />
</component>
</module>
\ No newline at end of file
--
Gitblit v1.9.3