Dev/michaelhu

.gitignore

@@ -11,6 +11,7 @@ temp
 
 resource/static
 etc/powerx-*
+!etc/powerx-example.yaml
 etc/powerx.yaml
 .deploy/*
 .build

api/admin.scrm.api

@@ -1,21 +1,21 @@
-import "admin/scrm/contactway.api"
-//import "admin/scrm/customer.api"
-//import "admin/scrm/contact.api"
-// organzation
-import "admin/scrm/organization/weworkUser.api"
-import "admin/scrm/organization/weworkDepartment.api"
-// app
-import "admin/scrm/app/weworkGroup.api"
-import "admin/scrm/app/weworkApp.api"
-import "admin/scrm/app/weworkAppMessage.api"
-// wechat.customer
-import "admin/scrm/customer/weworkCustomer.api"
-import "admin/scrm/customer/weworkCustomerGroup.api"
-// bot
-import "admin/scrm/bot/weworkBot.api"
-// resource
-import "admin/scrm/resource/weworkResource.api"
-// qrcode
-import "admin/scrm/qrcode/weworkCustomerGroupQRCode.api"
-// tag
-import "admin/scrm/tag/weworkTag.api"
+import "admin/scrm/wechat/wecom/contactway.api"
+    //import "admin/scrm/wechat/wecom/customer.api"
+    //import "admin/scrm/wechat/wecom/contact.api"
+    // organzation
+import "admin/scrm/wechat/wecom/organization/user.api"
+import "admin/scrm/wechat/wecom/organization/department.api"
+    // app
+import "admin/scrm/wechat/wecom/app/group.api"
+import "admin/scrm/wechat/wecom/app/app.api"
+import "admin/scrm/wechat/wecom/app/appMessage.api"
+    // wechat.customer
+import "admin/scrm/wechat/wecom/customer/customer.api"
+import "admin/scrm/wechat/wecom/customer/customerGroup.api"
+    // bot
+import "admin/scrm/wechat/wecom/bot/bot.api"
+    // resource
+import "admin/scrm/wechat/wecom/resource/resource.api"
+    // qrcode
+import "admin/scrm/wechat/wecom/qrcode/customerGroupQRCode.api"
+    // tag
+import "admin/scrm/wechat/wecom/tag/tag.api"

api/admin.wechat.offiaccount.api

@@ -1,3 +1,3 @@
-import "admin/wechat/officialaccount/menu.api"
-import "admin/wechat/officialaccount/media.api"
+import "admin/scrm/wechat/officialaccount/menu.api"
+import "admin/scrm/wechat/officialaccount/media.api"
 

api/admin/wechat/officialaccount/media.api → api/admin/scrm/wechat/officialAccount/media.api

@@ -9,8 +9,8 @@ info(
 )
 
 @server(
-    group: admin/wechat/officialaccount/media
-    prefix: /api/v1/admin/wechat/official-account
+    group: admin/scrm/wechat/officialAccount/media
+    prefix: /api/v1/admin/scrm/wechat/official-account
     middleware: UserJWTAuth
 )
 

api/admin/wechat/officialaccount/menu.api → api/admin/scrm/wechat/officialAccount/menu.api

@@ -9,8 +9,8 @@ info(
 )
 
 @server(
-    group: admin/wechat/officialaccount/menu
-    prefix: /api/v1/admin/wechat/official-account
+    group: admin/scrm/wechat/officialAccount/menu
+    prefix: /api/v1/admin/scrm/wechat/official-account
     middleware: UserJWTAuth
 )
 

api/admin/scrm/app/weworkApp.api → api/admin/scrm/wechat/wecom/app/app.api

@@ -9,19 +9,19 @@ info(
 )
 
 @server(
-    group: admin/scrm/app
-    prefix: /api/v1/admin/scrm/app/wechat
+    group: admin/scrm/wechat/wecom/app
+    prefix: /api/v1/admin/scrm/wechat/wecom/app
     middleware: UserJWTAuth
 )
 
 service PowerX {
     @doc "App详情"
-    @handler DetailWeWorkApp
+    @handler DetailWeComApp
     get /detail (ApplicationRequest) returns (ApplicationReply)
 
     @doc "App列表/options"
-    @handler ListWeWorkAppOption
-    get /options returns (AppWeWorkListReply)
+    @handler ListWeComAppOption
+    get /options returns (AppWeComListReply)
 }
 
 type (
@@ -44,12 +44,8 @@ type (
         CustomizedPublishStatus int `json:"customizedPublishStatus"`
     }
 
-    WeworkUser {
-        Userid string `json:"userId"`
-    }
-
     AllowUserinfos {
-        User []WeworkUser `json:"user"`
+        User []WeComUser `json:"user"`
     }
 
     AllowPartys {
@@ -61,7 +57,7 @@ type (
 )
 
 type (
-    AppWeWorkListReply {
+    AppWeComListReply {
         List []*AppWechat `json:"list"`
         //PageIndex int `json:"pageIndex"`
         //PageSize int `json:"pageSize"`

api/admin/scrm/app/weworkAppMessage.api → api/admin/scrm/wechat/wecom/app/appMessage.api

@@ -9,14 +9,14 @@ info(
 )
 
 @server(
-    group: admin/scrm/app
-    prefix: /api/v1/admin/scrm/app/wechat
+    group: admin/scrm/wechat/wecom/app
+    prefix: /api/v1/admin/scrm/wechat/wecom/app
     middleware: UserJWTAuth
 )
 
 service PowerX {
     @doc "App发送图文信息"
-    @handler SendWeWorkAppArticleMessage
+    @handler SendWeComAppArticleMessage
     post /message/articles (AppMessageArticlesRequest) returns (AppMessageBaseReply)
 
 }

api/admin/scrm/app/weworkGroup.api → api/admin/scrm/wechat/wecom/app/group.api

@@ -9,23 +9,23 @@ info(
 )
 
 @server(
-    group: admin/scrm/app
-    prefix: /api/v1/admin/scrm/app/wechat
+    group: admin/scrm/wechat/wecom/app
+    prefix: /api/v1/admin/scrm/wechat/wecom/app
     middleware: UserJWTAuth
 )
 
 service PowerX {
     @doc "App企业群列表/list"
-    @handler ListWeWorkAppGroup
+    @handler ListWeComAppGroup
     get /group/list (AppGroupListRequest) returns (AppGroupListReply)
 
 
     @doc "App创建企业群"
-    @handler CreateWeWorkAppGroup
+    @handler CreateWeComAppGroup
     post /group/create (AppGroupCreateRequest) returns (AppGroupCreateReply)
 
     @doc "App企业群推送图文信息"
-    @handler SendWeWorkAppGroupArticleMessage
+    @handler SendWeComAppGroupArticleMessage
     post /group/message/articles (AppGroupMessageArticleRequest) returns (AppGroupMessageReply)
 }
 

api/admin/scrm/bot/weworkBot.api → api/admin/scrm/wechat/wecom/bot/bot.api

@@ -9,14 +9,14 @@ info(
 )
 
 @server(
-    group: admin/scrm/bot
-    prefix: /api/v1/admin/scrm/bot/wechat
+    group: admin/scrm/wechat/wecom/bot
+    prefix: /api/v1/admin/scrm/wechat/wecom/bot
     middleware: UserJWTAuth
 )
 
 service PowerX {
     @doc "机器人发送图文信息"
-    @handler BotWeWorkArticles
+    @handler BotWeComArticles
     post /message/articles (GroupRobotMsgNewsArticlesRequest) returns (GroupRobotMsgNewsArticlesReply)
 }
 

api/admin/scrm/contactway.api → api/admin/scrm/wechat/wecom/contactWay.api

@@ -9,8 +9,8 @@ info(
 )
 
 @server(
-    group: admin/scrm/contractway
-    prefix: /api/v1/admin/contract-way
+    group: admin/scrm/wechat/wecom/contractway
+    prefix: /api/v1/admin/scrm/wechat/wecom/contract-ways
     middleware: UserJWTAuth
 )