Ver código fonte

权限更改

xiaoming_global 5 anos atrás
pai
commit
805d67cfe2

+ 381 - 248
.idea/workspace.xml Ver arquivo

@@ -4,11 +4,23 @@
4 4
     <list default="true" id="b2adb873-ba08-458c-9357-4c6584e112eb" name="Default" comment="">
5 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 6
       <change beforePath="$PROJECT_DIR$/conf/app.conf" beforeDir="false" afterPath="$PROJECT_DIR$/conf/app.conf" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/controllers/admin_user/admin_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/admin_user/admin_controller.go" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/controllers/admin_user/org_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/admin_user/org_controller.go" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/controllers/base_api_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/base_api_controller.go" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/controllers/global/qiniu_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/global/qiniu_controller.go" afterDir="false" />
7 11
       <change beforePath="$PROJECT_DIR$/controllers/micro/micro_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/micro/micro_controller.go" afterDir="false" />
8 12
       <change beforePath="$PROJECT_DIR$/controllers/micro/router_collector.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/micro/router_collector.go" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/controllers/site/site_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/site/site_controller.go" afterDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/controllers/mpwechat/reply_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/mpwechat/reply_controller.go" afterDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/controllers/staff/staff_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/staff/staff_controller.go" afterDir="false" />
15
+      <change beforePath="$PROJECT_DIR$/jobcron/qiniu_job.go" beforeDir="false" afterPath="$PROJECT_DIR$/jobcron/qiniu_job.go" afterDir="false" />
16
+      <change beforePath="$PROJECT_DIR$/models/site_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/site_models.go" afterDir="false" />
17
+      <change beforePath="$PROJECT_DIR$/models/wechat_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/wechat_models.go" afterDir="false" />
10 18
       <change beforePath="$PROJECT_DIR$/routers/router.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/router.go" afterDir="false" />
19
+      <change beforePath="$PROJECT_DIR$/service/db.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/db.go" afterDir="false" />
20
+      <change beforePath="$PROJECT_DIR$/service/redis.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/redis.go" afterDir="false" />
21
+      <change beforePath="$PROJECT_DIR$/service/role_service/role_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/role_service/role_service.go" afterDir="false" />
11 22
       <change beforePath="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" afterDir="false" />
23
+      <change beforePath="$PROJECT_DIR$/service/staff_service/staff_manager_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/staff_service/staff_manager_service.go" afterDir="false" />
12 24
     </list>
13 25
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
14 26
     <option name="TRACKING_ENABLED" value="true" />
@@ -19,93 +31,105 @@
19 31
   </component>
20 32
   <component name="FileEditorManager">
21 33
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
22
-      <file leaf-file-name="micro_controller.go" pinned="false" current-in-tab="false">
23
-        <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
34
+      <file leaf-file-name="main.go" pinned="false" current-in-tab="false">
35
+        <entry file="file://$PROJECT_DIR$/main.go">
24 36
           <provider selected="true" editor-type-id="text-editor">
25
-            <state relative-caret-position="101">
26
-              <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
37
+            <state relative-caret-position="275">
38
+              <caret line="18" column="14" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
27 39
               <folding>
28
-                <element signature="e#15#104#0" expanded="true" />
40
+                <element signature="e#14#132#0" expanded="true" />
29 41
               </folding>
30 42
             </state>
31 43
           </provider>
32 44
         </entry>
33 45
       </file>
34
-      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
35
-        <entry file="file://$PROJECT_DIR$/routers/router.go">
46
+      <file leaf-file-name="staff_controller.go" pinned="false" current-in-tab="false">
47
+        <entry file="file://$PROJECT_DIR$/controllers/staff/staff_controller.go">
36 48
           <provider selected="true" editor-type-id="text-editor">
37
-            <state relative-caret-position="154">
38
-              <caret line="35" column="26" selection-start-line="35" selection-start-column="11" selection-end-line="35" selection-end-column="26" />
49
+            <state relative-caret-position="3275">
50
+              <caret line="141" column="62" selection-start-line="141" selection-start-column="47" selection-end-line="141" selection-end-column="62" />
39 51
             </state>
40 52
           </provider>
41 53
         </entry>
42 54
       </file>
43
-      <file leaf-file-name="base_controller.go" pinned="false" current-in-tab="false">
44
-        <entry file="file://$PROJECT_DIR$/controllers/base_controller.go">
55
+      <file leaf-file-name="staff_manager_service.go" pinned="false" current-in-tab="false">
56
+        <entry file="file://$PROJECT_DIR$/service/staff_service/staff_manager_service.go">
45 57
           <provider selected="true" editor-type-id="text-editor">
46
-            <state relative-caret-position="44">
47
-              <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
58
+            <state relative-caret-position="130">
59
+              <caret line="29" column="19" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
48 60
             </state>
49 61
           </provider>
50 62
         </entry>
51 63
       </file>
52
-      <file leaf-file-name="router_collector.go" pinned="false" current-in-tab="false">
53
-        <entry file="file://$PROJECT_DIR$/controllers/micro/router_collector.go">
64
+      <file leaf-file-name="app.conf" pinned="false" current-in-tab="false">
65
+        <entry file="file://$PROJECT_DIR$/conf/app.conf">
54 66
           <provider selected="true" editor-type-id="text-editor">
55
-            <state relative-caret-position="132">
56
-              <caret line="6" column="16" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="16" />
67
+            <state relative-caret-position="2975">
68
+              <caret line="119" column="16" selection-start-line="119" selection-start-column="16" selection-end-line="119" selection-end-column="16" />
57 69
             </state>
58 70
           </provider>
59 71
         </entry>
60 72
       </file>
61
-      <file leaf-file-name="app.conf" pinned="false" current-in-tab="false">
62
-        <entry file="file://$PROJECT_DIR$/conf/app.conf">
73
+      <file leaf-file-name="role_controller.go" pinned="false" current-in-tab="false">
74
+        <entry file="file://$PROJECT_DIR$/controllers/role/role_controller.go">
63 75
           <provider selected="true" editor-type-id="text-editor">
64
-            <state relative-caret-position="198">
65
-              <caret line="9" selection-start-line="9" selection-end-line="9" />
76
+            <state relative-caret-position="178">
77
+              <caret line="184" column="77" selection-start-line="184" selection-start-column="45" selection-end-line="184" selection-end-column="77" />
66 78
             </state>
67 79
           </provider>
68 80
         </entry>
69 81
       </file>
70
-      <file leaf-file-name="router_collector.go" pinned="false" current-in-tab="false">
71
-        <entry file="file://$PROJECT_DIR$/controllers/article/router_collector.go">
82
+      <file leaf-file-name="role_service.go" pinned="false" current-in-tab="true">
83
+        <entry file="file://$PROJECT_DIR$/service/role_service/role_service.go">
72 84
           <provider selected="true" editor-type-id="text-editor">
73
-            <state relative-caret-position="66">
74
-              <caret line="3" column="18" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="18" />
85
+            <state relative-caret-position="267">
86
+              <caret line="317" column="83" selection-start-line="317" selection-start-column="83" selection-end-line="317" selection-end-column="83" />
75 87
             </state>
76 88
           </provider>
77 89
         </entry>
78 90
       </file>
79
-      <file leaf-file-name="article_controller.go" pinned="false" current-in-tab="false">
80
-        <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
91
+      <file leaf-file-name="purview_models.go" pinned="false" current-in-tab="false">
92
+        <entry file="file://$PROJECT_DIR$/models/purview_models.go">
81 93
           <provider selected="true" editor-type-id="text-editor">
82
-            <state relative-caret-position="1144">
83
-              <caret line="64" column="37" selection-start-line="64" selection-start-column="16" selection-end-line="64" selection-end-column="37" />
94
+            <state relative-caret-position="350">
95
+              <caret line="20" column="28" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="28" />
84 96
             </state>
85 97
           </provider>
86 98
         </entry>
87 99
       </file>
88
-      <file leaf-file-name="base_api_controller.go" pinned="false" current-in-tab="true">
89
-        <entry file="file://$PROJECT_DIR$/controllers/base_api_controller.go">
100
+      <file leaf-file-name="qiniu_job.go" pinned="false" current-in-tab="false">
101
+        <entry file="file://$PROJECT_DIR$/jobcron/qiniu_job.go">
90 102
           <provider selected="true" editor-type-id="text-editor">
91
-            <state relative-caret-position="-152">
92
-              <caret line="48" column="35" selection-start-line="48" selection-start-column="35" selection-end-line="48" selection-end-column="35" />
103
+            <state relative-caret-position="625">
104
+              <caret line="33" column="11" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="11" />
105
+              <folding>
106
+                <element signature="e#17#177#0" expanded="true" />
107
+              </folding>
93 108
             </state>
94 109
           </provider>
95 110
         </entry>
96 111
       </file>
97
-      <file leaf-file-name="site_controller.go" pinned="false" current-in-tab="false">
98
-        <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
112
+      <file leaf-file-name="qiniu_controller.go" pinned="false" current-in-tab="false">
113
+        <entry file="file://$PROJECT_DIR$/controllers/global/qiniu_controller.go">
99 114
           <provider selected="true" editor-type-id="text-editor">
100
-            <state relative-caret-position="73436">
101
-              <caret line="3351" column="28" selection-start-line="3351" selection-start-column="28" selection-end-line="3351" selection-end-column="28" />
115
+            <state relative-caret-position="325">
116
+              <caret line="20" column="59" selection-start-line="20" selection-start-column="59" selection-end-line="20" selection-end-column="59" />
102 117
               <folding>
103
-                <element signature="e#14#224#0" expanded="true" />
118
+                <element signature="e#16#134#0" expanded="true" />
104 119
               </folding>
105 120
             </state>
106 121
           </provider>
107 122
         </entry>
108 123
       </file>
124
+      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
125
+        <entry file="file://$PROJECT_DIR$/routers/router.go">
126
+          <provider selected="true" editor-type-id="text-editor">
127
+            <state relative-caret-position="150">
128
+              <caret line="25" column="109" selection-start-line="25" selection-start-column="86" selection-end-line="25" selection-end-column="109" />
129
+            </state>
130
+          </provider>
131
+        </entry>
132
+      </file>
109 133
     </leaf>
110 134
   </component>
111 135
   <component name="FileTemplateManagerImpl">
@@ -117,37 +141,44 @@
117 141
   </component>
118 142
   <component name="FindInProjectRecents">
119 143
     <findStrings>
120
-      <find>AddMagiclinkData</find>
121
-      <find>GetCategorys</find>
122
-      <find>/api/acticle/getCategorys</find>
123
-      <find>AddCategory</find>
124
-      <find>7</find>
125
-      <find>SgjPatientArticlelist</find>
126
-      <find>医院动态</find>
127
-      <find>Saveactivit</find>
128
-      <find>EditStaffInfo</find>
129
-      <find>/api/staff/EditStaffInfo</find>
130
-      <find>GetEnviromentImages</find>
131
-      <find>GetDoctorInfo</find>
132
-      <find>GetData</find>
133
-      <find>GetOrderModel</find>
134
-      <find>AddEditpic</find>
135
-      <find>GetEnImagesThree</find>
136
-      <find>GetEditRotationimages</find>
137
-      <find>GetRotationDetail</find>
138
-      <find>AddMacLinkAddress</find>
139
-      <find>GetMacLinkAddressByLastData</find>
140
-      <find>/api/site/getLikeMacAddressById</find>
141
-      <find>GetLikeMacAddressById</find>
142
-      <find>/api/site/updatesingleform</find>
143
-      <find>UpdateSingleForm</find>
144
-      <find>/api/site/updatepicformthree</find>
145
-      <find>AddLinkAddressThree</find>
146
-      <find>/api/site/saveditpic</find>
147
-      <find>SaveEditpic</find>
148
-      <find>UpdatePicFformThree</find>
149
-      <find>AdminCtlRegistRouters</find>
144
+      <find>ids</find>
145
+      <find>UpdateEditpicLink</find>
146
+      <find>scrm_verification_code</find>
147
+      <find>scrm_verification_code_</find>
148
+      <find>SMSBatch</find>
149
+      <find>UserSMSFreeLimit</find>
150
+      <find>redisClient</find>
151
+      <find>获取验证码</find>
152
+      <find>/api/password/code</find>
153
+      <find>CodeOfModifyPwd</find>
154
+      <find>/api/orginfo/edit</find>
155
+      <find>EditOrgInfo</find>
156
+      <find>/api/password/modify</find>
157
+      <find>ModifyPwd</find>
158
+      <find>DeleteConnecWay</find>
159
+      <find>Delet</find>
160
+      <find>/api/qiniu/uptoken</find>
161
+      <find>updated</find>
162
+      <find>qn_token</find>
163
+      <find>GetQNUpToken</find>
164
+      <find>qiniu_bucket</find>
165
+      <find>hash</find>
166
+      <find>package models\n\ntype AdminUser struct \{\n\	Id           int64  \`gorm\:\&quot;PRIMARY_KEY\;AUTO_INCREMENT\&quot; json\:\&quot;id\&quot;\` \/\/ 管理员用户 ID\n\	Mobile       string \`json\:\&quot;mobile\&quot;\`\n\	Password     string \`json\:\&quot;password\&quot;\`\n\	IsSuperAdmin bool   \`gorm\:\&quot;column\:is_super_admin\&quot; json\:\&quot;is_super_admin\&quot;\` \/\/ 是否为超级管理员\n\	Status       int8   \`json\:\&quot;status\&quot;\`                                      \/\/ 状态 0\.无效 1\.有效\n\	CreateTime   int64  \`gorm\:\&quot;column\:ctime\&quot; json\:\&quot;ctime\&quot;\`                   \/\/ 创建时间\n\	ModifyTime   int64  \`gorm\:\&quot;column\:mtime\&quot; json\:\&quot;mtime\&quot;\`                   \/\/ 修改时间\n\}\n\nfunc \(AdminUser\) TableName\(\) string \{\n\	return \&quot;sgj_user_admin\&quot;\n\}\n\ntype AdminUserLoginLog struct \{\n\	Id          int64  \`gorm\:\&quot;PRIMARY_KEY\;AUTO_INCREMENT\&quot;\` \/\/ 记录 ID\n\	AdminUserId int64  \`gorm\:\&quot;column\:admin_user_id\&quot;\`\n\	OrgId       int64  \`gorm\:\&quot;column\:org_id\&quot;\`\n\	AppId       int64  \`gorm\:\&quot;column\:app_id\&quot;\`\n\	IP          string \`gorm\:\&quot;column\:ip\&quot;\`\n\	OperateType int8   \`gorm\:\&quot;column\:operate_type\&quot;\` \/\/ 操作类型\(1\.登录\;2\.退出\;3\.切换机构\)\n\	AppType     int8   \`gorm\:\&quot;column\:app_type\&quot;\`     \/\/ 应用类型\,与 OrgApp\.AppType 一致\n\	CreateTime  int64  \`gorm\:\&quot;column\:ctime\&quot;\`        \/\/ 创建时间\n\}\n\nfunc \(AdminUserLoginLog\) TableName\(\) string \{\n\	return \&quot;sgj_user_admin_login_log\&quot;\n\}\n\ntype AdminUserElectronicSignature struct \{\n\	ID      int64  \`gorm\:\&quot;column\:id\&quot; json\:\&quot;id\&quot; form\:\&quot;id\&quot;\`\n\	Creator int64  \`gorm\:\&quot;column\:creator\&quot; json\:\&quot;creator\&quot; form\:\&quot;creator\&quot;\`\n\	OrgId   int64  \`gorm\:\&quot;column\:org_id\&quot; json\:\&quot;org_id\&quot; form\:\&quot;org_id\&quot;\`\n\	AppId   int64  \`gorm\:\&quot;column\:app_id\&quot; json\:\&quot;app_id\&quot; form\:\&quot;app_id\&quot;\`\n\	Url     string \`gorm\:\&quot;column\:url\&quot; json\:\&quot;url\&quot; form\:\&quot;url\&quot;\`\n\	Hash    string \`gorm\:\&quot;column\:hash\&quot; json\:\&quot;hash\&quot; form\:\&quot;hash\&quot;\`\n\	Status  int64  \`gorm\:\&quot;column\:status\&quot; json\:\&quot;status\&quot; form\:\&quot;status\&quot;\`\n\	Ctime   int64  \`gorm\:\&quot;column\:ctime\&quot; json\:\&quot;ctime\&quot; form\:\&quot;ctime\&quot;\`\n\	Mtime   int64  \`gorm\:\&quot;column\:mtime\&quot; json\:\&quot;mtime\&quot; form\:\&quot;mtime\&quot;\`\n\}\n\nfunc \(AdminUserElectronicSignature\) TableName\(\) string \{\n\	return \&quot;sgj_user_admin_electronic_signature\&quot;\n\}\n\n\/\/ 管理员用户特殊权限\,详见表注释\ntype AdminUserSpecialPermission struct \{\n\	ID          int64 \`gorm\:\&quot;column\:id\&quot; json\:\&quot;id\&quot;\`\n\	OrgID       int64 \`gorm\:\&quot;column\:org_id\&quot; json\:\&quot;org_id\&quot;\`\n\	AppID       int64 \`gorm\:\&quot;column\:app_id\&quot; json\:\&quot;app_id\&quot;\`\n\	AdminUserID int64 \`gorm\:\&quot;column\:admin_user_id\&quot; json\:\&quot;admin_user_id\&quot;\`\n\	Permission  int64 \`gorm\:\&quot;column\:permission\&quot; json\:\&quot;permission\&quot;\`\n\	Status      int64 \`gorm\:\&quot;column\:status\&quot; json\:\&quot;\-\&quot;\`\n\	CreateTime  int64 \`gorm\:\&quot;column\:ctime\&quot; json\:\&quot;\-\&quot;\`\n\	ModifyTime  int64 \`gorm\:\&quot;column\:mtime\&quot; json\:\&quot;\-\&quot;\`\n\}\n\nfunc \(AdminUserSpecialPermission\) TableName\(\) string \{\n\	return \&quot;xt_admin_user_special_permission\&quot;\n\}\n\ntype SpecialPermissionType int64\n\nconst \(\n\	_                              SpecialPermissionType \= iota\n\	SpecialPermissionTypeHeadNurse                       \/\/ 护士长\n\)\n</find>
167
+      <find>AdminUserElectronicSignature</find>
168
+      <find>key</find>
169
+      <find>new qiniu token:</find>
170
+      <find>QiniuCtlRegistRouters</find>
171
+      <find>GetAllStaffInfo</find>
172
+      <find>/role/purview/editinit</find>
173
+      <find>EditPurviewInitData</find>
150 174
     </findStrings>
175
+    <replaceStrings>
176
+      <replace />
177
+    </replaceStrings>
178
+    <dirStrings>
179
+      <dir>D:\goyard\src\SCRM\controllers\article</dir>
180
+      <dir>D:\goyard\src\SCRM\enums</dir>
181
+    </dirStrings>
151 182
   </component>
152 183
   <component name="GOROOT" path="C:\Go" />
153 184
   <component name="Git.Settings">
@@ -161,7 +192,6 @@
161 192
         <option value="$PROJECT_DIR$/controllers/base_controller.go" />
162 193
         <option value="$PROJECT_DIR$/controllers/mpwechat/mpwechat_controller.go" />
163 194
         <option value="$PROJECT_DIR$/../github.com/go-redis/redis/commands.go" />
164
-        <option value="$PROJECT_DIR$/service/redis.go" />
165 195
         <option value="$PROJECT_DIR$/jobcron/open_wechat_job.go" />
166 196
         <option value="$PROJECT_DIR$/controllers/global/open_wechat_controller.go" />
167 197
         <option value="$PROJECT_DIR$/controllers/members/members_controller.go" />
@@ -170,18 +200,36 @@
170 200
         <option value="$PROJECT_DIR$/controllers/mpwechat/menu_controller.go" />
171 201
         <option value="$PROJECT_DIR$/service/wechat_service/open_wechat_service.go" />
172 202
         <option value="$PROJECT_DIR$/controllers/article/article_controller.go" />
173
-        <option value="$PROJECT_DIR$/main.go" />
174 203
         <option value="$PROJECT_DIR$/models/activity_models.go" />
175
-        <option value="$PROJECT_DIR$/models/site_models.go" />
176 204
         <option value="$PROJECT_DIR$/models/article_models.go" />
177 205
         <option value="$PROJECT_DIR$/service/article_service/article_category_service.go" />
178 206
         <option value="$PROJECT_DIR$/service/micro_service/micro_service.go" />
179
-        <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
180 207
         <option value="$PROJECT_DIR$/controllers/site/site_controller.go" />
181
-        <option value="$PROJECT_DIR$/conf/app.conf" />
182
-        <option value="$PROJECT_DIR$/routers/router.go" />
208
+        <option value="$PROJECT_DIR$/models/site_models.go" />
209
+        <option value="$PROJECT_DIR$/controllers/staff/staff_controller.go" />
183 210
         <option value="$PROJECT_DIR$/controllers/micro/router_collector.go" />
211
+        <option value="$PROJECT_DIR$/routers/router.go" />
212
+        <option value="$PROJECT_DIR$/controllers/register/router_collector.go" />
213
+        <option value="$PROJECT_DIR$/models/login_models.go" />
214
+        <option value="$PROJECT_DIR$/service/login_service/login_service.go" />
184 215
         <option value="$PROJECT_DIR$/controllers/micro/micro_controller.go" />
216
+        <option value="$PROJECT_DIR$/controllers/register/reigster_contrller.go" />
217
+        <option value="$PROJECT_DIR$/service/redis.go" />
218
+        <option value="$PROJECT_DIR$/service/sms_service/sms_vms.go" />
219
+        <option value="$PROJECT_DIR$/controllers/admin_user/org_controller.go" />
220
+        <option value="$PROJECT_DIR$/controllers/mpwechat/reply_controller.go" />
221
+        <option value="$PROJECT_DIR$/models/wechat_models.go" />
222
+        <option value="$PROJECT_DIR$/service/site_service/site_microwebsite_service.go" />
223
+        <option value="$PROJECT_DIR$/controllers/base_api_controller.go" />
224
+        <option value="$PROJECT_DIR$/service/db.go" />
225
+        <option value="$PROJECT_DIR$/controllers/admin_user/admin_controller.go" />
226
+        <option value="$PROJECT_DIR$/main.go" />
227
+        <option value="$PROJECT_DIR$/jobcron/qiniu_job.go" />
228
+        <option value="$PROJECT_DIR$/conf/app.conf" />
229
+        <option value="$PROJECT_DIR$/controllers/global/qiniu_controller.go" />
230
+        <option value="$PROJECT_DIR$/service/staff_service/staff_manager_service.go" />
231
+        <option value="$PROJECT_DIR$/controllers/role/role_controller.go" />
232
+        <option value="$PROJECT_DIR$/service/role_service/role_service.go" />
185 233
       </list>
186 234
     </option>
187 235
   </component>
@@ -191,11 +239,11 @@
191 239
     <detection-done>true</detection-done>
192 240
     <sorting>DEFINITION_ORDER</sorting>
193 241
   </component>
194
-  <component name="ProjectFrameBounds">
195
-    <option name="x" value="56" />
196
-    <option name="y" value="57" />
242
+  <component name="ProjectFrameBounds" extendedState="6">
243
+    <option name="x" value="-20" />
244
+    <option name="y" value="350" />
197 245
     <option name="width" value="1785" />
198
-    <option name="height" value="1003" />
246
+    <option name="height" value="805" />
199 247
   </component>
200 248
   <component name="ProjectView">
201 249
     <navigator proportions="" version="1">
@@ -220,11 +268,85 @@
220 268
               <item name="SCRM" type="462c0819:PsiDirectoryNode" />
221 269
               <item name="controllers" type="462c0819:PsiDirectoryNode" />
222 270
             </path>
271
+            <path>
272
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
273
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
274
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
275
+              <item name="admin_user" type="462c0819:PsiDirectoryNode" />
276
+            </path>
277
+            <path>
278
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
279
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
280
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
281
+              <item name="article" type="462c0819:PsiDirectoryNode" />
282
+            </path>
283
+            <path>
284
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
285
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
286
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
287
+              <item name="global" type="462c0819:PsiDirectoryNode" />
288
+            </path>
289
+            <path>
290
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
291
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
292
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
293
+              <item name="login" type="462c0819:PsiDirectoryNode" />
294
+            </path>
295
+            <path>
296
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
297
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
298
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
299
+              <item name="staff" type="462c0819:PsiDirectoryNode" />
300
+            </path>
301
+            <path>
302
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
303
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
304
+              <item name="jobcron" type="462c0819:PsiDirectoryNode" />
305
+            </path>
306
+            <path>
307
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
308
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
309
+              <item name="models" type="462c0819:PsiDirectoryNode" />
310
+            </path>
223 311
             <path>
224 312
               <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
225 313
               <item name="SCRM" type="462c0819:PsiDirectoryNode" />
226 314
               <item name="routers" type="462c0819:PsiDirectoryNode" />
227 315
             </path>
316
+            <path>
317
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
318
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
319
+              <item name="service" type="462c0819:PsiDirectoryNode" />
320
+            </path>
321
+            <path>
322
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
323
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
324
+              <item name="service" type="462c0819:PsiDirectoryNode" />
325
+              <item name="article_service" type="462c0819:PsiDirectoryNode" />
326
+            </path>
327
+            <path>
328
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
329
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
330
+              <item name="service" type="462c0819:PsiDirectoryNode" />
331
+              <item name="district_service" type="462c0819:PsiDirectoryNode" />
332
+            </path>
333
+            <path>
334
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
335
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
336
+              <item name="service" type="462c0819:PsiDirectoryNode" />
337
+              <item name="login_service" type="462c0819:PsiDirectoryNode" />
338
+            </path>
339
+            <path>
340
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
341
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
342
+              <item name="service" type="462c0819:PsiDirectoryNode" />
343
+              <item name="marketing_tool_service" type="462c0819:PsiDirectoryNode" />
344
+            </path>
345
+            <path>
346
+              <item name="SCRM" type="b2602c69:ProjectViewProjectNode" />
347
+              <item name="SCRM" type="462c0819:PsiDirectoryNode" />
348
+              <item name="static" type="462c0819:PsiDirectoryNode" />
349
+            </path>
228 350
           </expand>
229 351
           <select />
230 352
         </subPane>
@@ -238,7 +360,7 @@
238 360
     <property name="configurable.Project.GOPATH.is.expanded" value="true" />
239 361
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
240 362
     <property name="go.sdk.automatically.set" value="true" />
241
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../KYA" />
363
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
242 364
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
243 365
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
244 366
     <property name="settings.editor.selected.configurable" value="com.goide.configuration.GoLibrariesConfigurableProvider" />
@@ -261,17 +383,18 @@
261 383
     </option>
262 384
   </component>
263 385
   <component name="ToolWindowManager">
264
-    <frame x="45" y="46" width="1428" height="802" extended-state="0" />
386
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
265 387
     <layout>
266
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.62564105" visible="true" weight="0.24014598" />
388
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.7577197" visible="true" weight="0.28150135" />
267 389
       <window_info anchor="bottom" id="TODO" order="6" />
268
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.14379562" side_tool="true" visible="true" weight="0.41353384" />
390
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.15549597" side_tool="true" weight="0.30099857" />
269 391
       <window_info anchor="right" id="Database" order="3" />
392
+      <window_info anchor="bottom" id="Find" order="1" />
270 393
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
271
-      <window_info anchor="bottom" id="Version Control" order="9" />
394
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.39372325" />
272 395
       <window_info anchor="bottom" id="Run" order="2" />
273
-      <window_info id="Structure" order="1" sideWeight="0.37435898" side_tool="true" visible="true" weight="0.24014598" />
274
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.8562044" visible="true" weight="0.41353384" />
396
+      <window_info id="Structure" order="1" sideWeight="0.24228029" side_tool="true" visible="true" weight="0.28150135" />
397
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.844504" visible="true" weight="0.39942938" />
275 398
       <window_info id="Favorites" order="2" side_tool="true" />
276 399
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
277 400
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -280,7 +403,6 @@
280 403
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
281 404
       <window_info anchor="bottom" id="Message" order="0" />
282 405
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
283
-      <window_info anchor="bottom" id="Find" order="1" />
284 406
     </layout>
285 407
   </component>
286 408
   <component name="TypeScriptGeneratedFilesManager">
@@ -295,366 +417,377 @@
295 417
     </breakpoint-manager>
296 418
   </component>
297 419
   <component name="editorHistoryManager">
298
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
420
+    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
299 421
       <provider selected="true" editor-type-id="text-editor">
300
-        <state relative-caret-position="132">
301
-          <caret line="22" column="59" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="59" />
422
+        <state relative-caret-position="175">
423
+          <caret line="16" column="5" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
302 424
         </state>
303 425
       </provider>
304 426
     </entry>
305 427
     <entry file="file://$PROJECT_DIR$/conf/app.conf">
306 428
       <provider selected="true" editor-type-id="text-editor">
307
-        <state relative-caret-position="2662">
308
-          <caret line="121" lean-forward="true" selection-start-line="81" selection-end-line="121" />
429
+        <state relative-caret-position="3025">
430
+          <caret line="121" selection-start-line="121" selection-end-line="121" />
309 431
         </state>
310 432
       </provider>
311 433
     </entry>
312
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
434
+    <entry file="file://$PROJECT_DIR$/controllers/members/members_controller.go">
313 435
       <provider selected="true" editor-type-id="text-editor">
314
-        <state relative-caret-position="132">
315
-          <caret line="22" column="59" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="59" />
436
+        <state relative-caret-position="8350">
437
+          <caret line="346" column="39" lean-forward="true" selection-start-line="346" selection-start-column="39" selection-end-line="346" selection-end-column="39" />
316 438
         </state>
317 439
       </provider>
318 440
     </entry>
319
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
441
+    <entry file="file://$PROJECT_DIR$/main.go">
320 442
       <provider selected="true" editor-type-id="text-editor">
321
-        <state relative-caret-position="44">
322
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
443
+        <state relative-caret-position="750">
444
+          <caret line="30" column="29" selection-start-line="30" selection-start-column="15" selection-end-line="30" selection-end-column="29" />
445
+          <folding>
446
+            <element signature="e#14#132#0" expanded="true" />
447
+          </folding>
323 448
         </state>
324 449
       </provider>
325 450
     </entry>
326
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
451
+    <entry file="file://$PROJECT_DIR$/models/district_models.go">
327 452
       <provider selected="true" editor-type-id="text-editor">
328
-        <state relative-caret-position="132">
329
-          <caret line="22" column="59" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="59" />
453
+        <state relative-caret-position="44">
454
+          <caret line="2" column="5" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
330 455
         </state>
331 456
       </provider>
332 457
     </entry>
333
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
458
+    <entry file="file://$PROJECT_DIR$/models/org_models.go">
334 459
       <provider selected="true" editor-type-id="text-editor">
335
-        <state relative-caret-position="44">
336
-          <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
460
+        <state relative-caret-position="374">
461
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
337 462
         </state>
338 463
       </provider>
339 464
     </entry>
340
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
465
+    <entry file="file://$PROJECT_DIR$/service/org_service/org_info_service.go">
341 466
       <provider selected="true" editor-type-id="text-editor">
342
-        <state relative-caret-position="308">
343
-          <caret line="30" column="32" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
467
+        <state relative-caret-position="110">
468
+          <caret line="9" column="52" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="52" />
344 469
         </state>
345 470
       </provider>
346 471
     </entry>
347
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
472
+    <entry file="file://$PROJECT_DIR$/controllers/role/admin_controller.go">
348 473
       <provider selected="true" editor-type-id="text-editor">
349
-        <state relative-caret-position="308">
350
-          <caret line="30" column="32" lean-forward="true" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
474
+        <state relative-caret-position="316">
475
+          <caret line="92" column="43" selection-start-line="92" selection-start-column="35" selection-end-line="92" selection-end-column="43" />
351 476
         </state>
352 477
       </provider>
353 478
     </entry>
354
-    <entry file="file://$PROJECT_DIR$/controllers/members/router_controller.go">
479
+    <entry file="file://$PROJECT_DIR$/models/service_models.go">
355 480
       <provider selected="true" editor-type-id="text-editor">
356
-        <state relative-caret-position="44">
357
-          <caret line="2" column="20" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="20" />
481
+        <state relative-caret-position="1936">
482
+          <caret line="88" column="30" selection-start-line="88" selection-start-column="12" selection-end-line="88" selection-end-column="30" />
358 483
         </state>
359 484
       </provider>
360 485
     </entry>
361
-    <entry file="file://$PROJECT_DIR$/controllers/mpwechat/reply_controller.go">
486
+    <entry file="file://$PROJECT_DIR$/service/admin_service/verify_login_token_service.go">
362 487
       <provider selected="true" editor-type-id="text-editor">
363
-        <state relative-caret-position="59">
364
-          <caret line="16" column="5" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
488
+        <state relative-caret-position="88">
489
+          <caret line="18" column="18" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="18" />
365 490
         </state>
366 491
       </provider>
367 492
     </entry>
368
-    <entry file="file://$PROJECT_DIR$/controllers/mpwechat/material_controller.go">
493
+    <entry file="file://$PROJECT_DIR$/views/index.tpl">
369 494
       <provider selected="true" editor-type-id="text-editor">
370
-        <state relative-caret-position="59">
371
-          <caret line="20" column="5" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
495
+        <state relative-caret-position="222">
496
+          <caret line="6" column="4417" selection-start-line="6" selection-start-column="4417" selection-end-line="6" selection-end-column="4417" />
372 497
         </state>
373 498
       </provider>
374 499
     </entry>
375
-    <entry file="file://$PROJECT_DIR$/controllers/mpwechat/router_controller.go">
500
+    <entry file="file://$PROJECT_DIR$/controllers/base_controller.go">
376 501
       <provider selected="true" editor-type-id="text-editor">
377
-        <state relative-caret-position="132">
378
-          <caret line="6" column="30" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="30" />
502
+        <state relative-caret-position="198">
503
+          <caret line="14" column="48" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="48" />
379 504
         </state>
380 505
       </provider>
381 506
     </entry>
382
-    <entry file="file://$PROJECT_DIR$/service/wechat_service/open_wechat_model.go">
507
+    <entry file="file://$PROJECT_DIR$/models/sms_models.go">
383 508
       <provider selected="true" editor-type-id="text-editor">
384
-        <state relative-caret-position="22">
385
-          <caret line="17" column="5" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
509
+        <state relative-caret-position="440">
510
+          <caret line="20" selection-start-line="20" selection-end-line="33" selection-end-column="1" />
386 511
         </state>
387 512
       </provider>
388 513
     </entry>
389
-    <entry file="file://$PROJECT_DIR$/utils/tools.go">
514
+    <entry file="file://$PROJECT_DIR$/controllers/admin_user/org_controller.go">
390 515
       <provider selected="true" editor-type-id="text-editor">
391
-        <state relative-caret-position="170">
392
-          <caret line="244" column="5" selection-start-line="244" selection-start-column="5" selection-end-line="244" selection-end-column="5" />
516
+        <state relative-caret-position="1034">
517
+          <caret line="60" column="42" selection-start-line="60" selection-start-column="31" selection-end-line="60" selection-end-column="42" />
393 518
         </state>
394 519
       </provider>
395 520
     </entry>
396
-    <entry file="file://$PROJECT_DIR$/service/redis.go">
521
+    <entry file="file://$PROJECT_DIR$/service/sms_service/sms_db_service.go">
397 522
       <provider selected="true" editor-type-id="text-editor">
398
-        <state relative-caret-position="336">
399
-          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
523
+        <state relative-caret-position="200">
524
+          <caret line="8" column="28" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
400 525
         </state>
401 526
       </provider>
402 527
     </entry>
403
-    <entry file="file://$PROJECT_DIR$/../github.com/go-redis/redis/command.go">
528
+    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
404 529
       <provider selected="true" editor-type-id="text-editor">
405
-        <state relative-caret-position="182">
406
-          <caret line="577" column="22" selection-start-line="577" selection-start-column="22" selection-end-line="577" selection-end-column="22" />
530
+        <state relative-caret-position="100">
531
+          <caret line="9" column="57" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="57" />
407 532
         </state>
408 533
       </provider>
409 534
     </entry>
410
-    <entry file="file://$PROJECT_DIR$/../github.com/go-redis/redis/commands.go">
535
+    <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
411 536
       <provider selected="true" editor-type-id="text-editor">
412
-        <state relative-caret-position="164">
413
-          <caret line="753" column="18" selection-start-line="753" selection-start-column="18" selection-end-line="753" selection-end-column="18" />
537
+        <state>
538
+          <caret line="3350" column="61" selection-start-line="3350" selection-start-column="44" selection-end-line="3350" selection-end-column="61" />
414 539
         </state>
415 540
       </provider>
416 541
     </entry>
417
-    <entry file="file://$PROJECT_DIR$/controllers/mpwechat/mpwechat_controller.go">
542
+    <entry file="file://$PROJECT_DIR$/models/admin_user_models.go">
418 543
       <provider selected="true" editor-type-id="text-editor">
419
-        <state relative-caret-position="110">
420
-          <caret line="13" column="95" selection-start-line="13" selection-start-column="82" selection-end-line="13" selection-end-column="95" />
544
+        <state relative-caret-position="90">
545
+          <caret line="27" column="45" selection-start-line="27" selection-start-column="45" selection-end-line="27" selection-end-column="45" />
421 546
         </state>
422 547
       </provider>
423 548
     </entry>
424
-    <entry file="file://$PROJECT_DIR$/controllers/global/open_wechat_controller.go">
549
+    <entry file="file://$PROJECT_DIR$/models/site_models.go">
425 550
       <provider selected="true" editor-type-id="text-editor">
426
-        <state relative-caret-position="23">
427
-          <caret line="38" column="49" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="49" />
551
+        <state relative-caret-position="-7075">
552
+          <caret line="44" selection-start-line="44" selection-end-line="44" />
428 553
         </state>
429 554
       </provider>
430 555
     </entry>
431
-    <entry file="file://$PROJECT_DIR$/jobcron/open_wechat_job.go">
556
+    <entry file="file://$PROJECT_DIR$/jobcron/activity_short_url_job.go">
432 557
       <provider selected="true" editor-type-id="text-editor">
433
-        <state relative-caret-position="64">
434
-          <caret line="109" column="68" selection-start-line="109" selection-start-column="47" selection-end-line="109" selection-end-column="68" />
558
+        <state relative-caret-position="-1600">
559
+          <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
560
+          <folding>
561
+            <element signature="e#17#191#0" expanded="true" />
562
+          </folding>
435 563
         </state>
436 564
       </provider>
437 565
     </entry>
438
-    <entry file="file://$PROJECT_DIR$/service/db.go">
566
+    <entry file="file://$PROJECT_DIR$/../github.com/qiniu/api.v7/storage/token.go">
439 567
       <provider selected="true" editor-type-id="text-editor">
440
-        <state relative-caret-position="1122">
441
-          <caret line="57" selection-start-line="57" selection-end-line="57" />
568
+        <state relative-caret-position="88">
569
+          <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
442 570
         </state>
443 571
       </provider>
444 572
     </entry>
445
-    <entry file="file://$PROJECT_DIR$/service/admin_service/verify_login_token_service.go">
573
+    <entry file="file://$PROJECT_DIR$/controllers/admin_user/admin_controller.go">
446 574
       <provider selected="true" editor-type-id="text-editor">
447
-        <state relative-caret-position="440">
448
-          <caret line="20" column="75" selection-start-line="20" selection-start-column="61" selection-end-line="20" selection-end-column="75" />
575
+        <state relative-caret-position="1125">
576
+          <caret line="102" column="43" selection-start-line="102" selection-start-column="43" selection-end-line="102" selection-end-column="43" />
449 577
         </state>
450 578
       </provider>
451 579
     </entry>
452
-    <entry file="file://$PROJECT_DIR$/controllers/site/router_collector.go">
580
+    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
453 581
       <provider selected="true" editor-type-id="text-editor">
454
-        <state relative-caret-position="66">
455
-          <caret line="3" column="15" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="15" />
582
+        <state relative-caret-position="228">
583
+          <caret line="702" column="5" lean-forward="true" selection-start-line="702" selection-start-column="5" selection-end-line="702" selection-end-column="5" />
456 584
         </state>
457 585
       </provider>
458 586
     </entry>
459
-    <entry file="file://$PROJECT_DIR$/service/member_service/models.go">
587
+    <entry file="file://$PROJECT_DIR$/controllers/global/district_controller.go">
460 588
       <provider selected="true" editor-type-id="text-editor">
461
-        <state relative-caret-position="110">
462
-          <caret line="7" column="23" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="23" />
589
+        <state relative-caret-position="-260">
590
+          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
463 591
         </state>
464 592
       </provider>
465 593
     </entry>
466
-    <entry file="file://$PROJECT_DIR$/controllers/members/members_controller.go">
594
+    <entry file="file://$PROJECT_DIR$/controllers/global/error_controller.go">
467 595
       <provider selected="true" editor-type-id="text-editor">
468
-        <state relative-caret-position="44">
469
-          <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
470
-        </state>
596
+        <state relative-caret-position="-300" />
471 597
       </provider>
472 598
     </entry>
473
-    <entry file="file://$PROJECT_DIR$/models/user_customer_models.go">
599
+    <entry file="file://$PROJECT_DIR$/controllers/global/open_wechat_controller.go">
474 600
       <provider selected="true" editor-type-id="text-editor">
475
-        <state relative-caret-position="44">
476
-          <caret line="2" column="17" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="17" />
477
-        </state>
601
+        <state relative-caret-position="-4425" />
478 602
       </provider>
479 603
     </entry>
480
-    <entry file="file://$PROJECT_DIR$/service/member_service/member_service.go">
604
+    <entry file="file://$PROJECT_DIR$/controllers/global/sms_controller.go">
481 605
       <provider selected="true" editor-type-id="text-editor">
482
-        <state relative-caret-position="180">
483
-          <caret line="187" selection-start-line="187" selection-end-line="187" />
484
-        </state>
606
+        <state relative-caret-position="-846" />
485 607
       </provider>
486 608
     </entry>
487
-    <entry file="file://$PROJECT_DIR$/service/wechat_service/open_wechat_service.go">
609
+    <entry file="file://$PROJECT_DIR$/controllers/login/login_controller.go">
488 610
       <provider selected="true" editor-type-id="text-editor">
489
-        <state relative-caret-position="90">
490
-          <caret line="463" column="22" selection-start-line="463" selection-start-column="5" selection-end-line="463" selection-end-column="22" />
611
+        <state relative-caret-position="-1925">
612
+          <caret line="59" column="3" selection-start-line="59" selection-start-column="3" selection-end-line="59" selection-end-column="3" />
491 613
         </state>
492 614
       </provider>
493 615
     </entry>
494
-    <entry file="file://$PROJECT_DIR$/controllers/mpwechat/menu_controller.go">
616
+    <entry file="file://$PROJECT_DIR$/service/login_service/login_service.go">
495 617
       <provider selected="true" editor-type-id="text-editor">
496
-        <state relative-caret-position="185">
497
-          <caret line="219" column="42" selection-start-line="219" selection-start-column="25" selection-end-line="219" selection-end-column="42" />
618
+        <state relative-caret-position="50">
619
+          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
620
+          <folding>
621
+            <element signature="e#23#71#0" expanded="true" />
622
+          </folding>
498 623
         </state>
499 624
       </provider>
500 625
     </entry>
501
-    <entry file="file://$PROJECT_DIR$/utils/stringtool.go">
626
+    <entry file="file://$PROJECT_DIR$/service/district_service/district_service.go">
502 627
       <provider selected="true" editor-type-id="text-editor">
503
-        <state relative-caret-position="214">
504
-          <caret line="33" column="4" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
628
+        <state relative-caret-position="100">
629
+          <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
505 630
         </state>
506 631
       </provider>
507 632
     </entry>
508
-    <entry file="file://$PROJECT_DIR$/main.go">
633
+    <entry file="file://$PROJECT_DIR$/service/db.go">
509 634
       <provider selected="true" editor-type-id="text-editor">
510
-        <state relative-caret-position="550">
511
-          <caret line="32" column="44" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="44" />
635
+        <state relative-caret-position="53">
636
+          <caret line="50" selection-start-line="50" selection-end-line="50" />
512 637
         </state>
513 638
       </provider>
514 639
     </entry>
515
-    <entry file="file://$PROJECT_DIR$/models/activity_models.go">
640
+    <entry file="file://$PROJECT_DIR$/service/marketing_tool_service/activity_service.go">
516 641
       <provider selected="true" editor-type-id="text-editor">
517
-        <state relative-caret-position="470">
518
-          <caret line="99" column="33" selection-start-line="99" selection-start-column="33" selection-end-line="99" selection-end-column="33" />
519
-        </state>
642
+        <state relative-caret-position="-75" />
520 643
       </provider>
521 644
     </entry>
522
-    <entry file="file://$PROJECT_DIR$/models/article_models.go">
645
+    <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
523 646
       <provider selected="true" editor-type-id="text-editor">
524
-        <state relative-caret-position="286">
525
-          <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
647
+        <state relative-caret-position="50">
648
+          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
649
+          <folding>
650
+            <element signature="e#25#107#0" expanded="true" />
651
+          </folding>
526 652
         </state>
527 653
       </provider>
528 654
     </entry>
529
-    <entry file="file://$PROJECT_DIR$/models/user_models.go">
655
+    <entry file="file://$PROJECT_DIR$/jobcron/sms_job.go">
530 656
       <provider selected="true" editor-type-id="text-editor">
531
-        <state relative-caret-position="836">
532
-          <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
533
-        </state>
657
+        <state relative-caret-position="-96" />
534 658
       </provider>
535 659
     </entry>
536
-    <entry file="file://$PROJECT_DIR$/controllers/staff/staff_controller.go">
660
+    <entry file="file://$PROJECT_DIR$/controllers/members/members_controller.go">
537 661
       <provider selected="true" editor-type-id="text-editor">
538
-        <state relative-caret-position="302">
539
-          <caret line="240" column="33" selection-start-line="240" selection-start-column="18" selection-end-line="240" selection-end-column="33" />
662
+        <state relative-caret-position="8350">
663
+          <caret line="346" column="39" selection-start-line="346" selection-start-column="39" selection-end-line="346" selection-end-column="39" />
540 664
         </state>
541 665
       </provider>
542 666
     </entry>
543
-    <entry file="file://$PROJECT_DIR$/service/staff_service/staff_manager_service.go">
667
+    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
544 668
       <provider selected="true" editor-type-id="text-editor">
545
-        <state relative-caret-position="130">
546
-          <caret line="35" column="20" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="20" />
669
+        <state relative-caret-position="175">
670
+          <caret line="16" column="5" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
547 671
         </state>
548 672
       </provider>
549 673
     </entry>
550
-    <entry file="file://$PROJECT_DIR$/service/article_service/article_category_service.go">
674
+    <entry file="file://$PROJECT_DIR$/jobcron/open_wechat_job.go">
551 675
       <provider selected="true" editor-type-id="text-editor">
552
-        <state relative-caret-position="792">
553
-          <caret line="42" column="4" selection-start-line="42" selection-start-column="4" selection-end-line="51" selection-end-column="9" />
676
+        <state relative-caret-position="2925">
677
+          <caret line="130" selection-start-line="130" selection-end-line="130" />
678
+          <folding>
679
+            <element signature="e#17#214#0" expanded="true" />
680
+          </folding>
554 681
         </state>
555 682
       </provider>
556 683
     </entry>
557
-    <entry file="file://$PROJECT_DIR$/models/site_models.go">
684
+    <entry file="file://$PROJECT_DIR$/../github.com/astaxie/beego/controller.go">
558 685
       <provider selected="true" editor-type-id="text-editor">
559
-        <state relative-caret-position="6182">
560
-          <caret line="281" column="15" selection-start-line="281" selection-start-column="4" selection-end-line="281" selection-end-column="15" />
686
+        <state relative-caret-position="41">
687
+          <caret line="150" column="21" selection-start-line="150" selection-start-column="21" selection-end-line="150" selection-end-column="21" />
561 688
         </state>
562 689
       </provider>
563 690
     </entry>
564
-    <entry file="file://$PROJECT_DIR$/service/micro_service/micro_service.go">
691
+    <entry file="file://$PROJECT_DIR$/controllers/base_api_controller.go">
565 692
       <provider selected="true" editor-type-id="text-editor">
566
-        <state relative-caret-position="330">
567
-          <caret line="20" column="6" selection-start-line="18" selection-start-column="76" selection-end-line="20" selection-end-column="6" />
693
+        <state relative-caret-position="1400">
694
+          <caret line="56" column="26" lean-forward="true" selection-start-line="56" selection-start-column="26" selection-end-line="56" selection-end-column="26" />
695
+          <folding>
696
+            <element signature="e#21#90#0" expanded="true" />
697
+          </folding>
568 698
         </state>
569 699
       </provider>
570 700
     </entry>
571
-    <entry file="file://$PROJECT_DIR$/service/site_service/site_microwebsite_service.go">
701
+    <entry file="file://$PROJECT_DIR$/controllers/global/router_collector.go">
572 702
       <provider selected="true" editor-type-id="text-editor">
573
-        <state relative-caret-position="26180">
574
-          <caret line="1199" column="57" selection-start-line="1199" selection-start-column="57" selection-end-line="1199" selection-end-column="57" />
703
+        <state relative-caret-position="125">
704
+          <caret line="5" column="27" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="27" />
575 705
         </state>
576 706
       </provider>
577 707
     </entry>
578
-    <entry file="file://$PROJECT_DIR$/controllers/site/site_controller.go">
708
+    <entry file="file://$PROJECT_DIR$/jobcron/qiniu_job.go">
579 709
       <provider selected="true" editor-type-id="text-editor">
580
-        <state relative-caret-position="73436">
581
-          <caret line="3351" column="28" selection-start-line="3351" selection-start-column="28" selection-end-line="3351" selection-end-column="28" />
710
+        <state relative-caret-position="625">
711
+          <caret line="33" column="11" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="11" />
582 712
           <folding>
583
-            <element signature="e#14#224#0" expanded="true" />
713
+            <element signature="e#17#177#0" expanded="true" />
584 714
           </folding>
585 715
         </state>
586 716
       </provider>
587 717
     </entry>
588
-    <entry file="file://$PROJECT_DIR$/controllers/admin_user/admin_controller.go">
718
+    <entry file="file://$PROJECT_DIR$/controllers/global/qiniu_controller.go">
589 719
       <provider selected="true" editor-type-id="text-editor">
590
-        <state relative-caret-position="242">
591
-          <caret line="22" column="34" selection-start-line="22" selection-start-column="34" selection-end-line="22" selection-end-column="34" />
720
+        <state relative-caret-position="325">
721
+          <caret line="20" column="59" selection-start-line="20" selection-start-column="59" selection-end-line="20" selection-end-column="59" />
722
+          <folding>
723
+            <element signature="e#16#134#0" expanded="true" />
724
+          </folding>
592 725
         </state>
593 726
       </provider>
594 727
     </entry>
595
-    <entry file="file://$PROJECT_DIR$/controllers/admin_user/router_collector.go">
728
+    <entry file="file://$PROJECT_DIR$/service/redis.go">
596 729
       <provider selected="true" editor-type-id="text-editor">
597
-        <state relative-caret-position="44">
598
-          <caret line="2" column="5" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
730
+        <state relative-caret-position="295">
731
+          <caret line="17" column="39" selection-start-line="17" selection-start-column="39" selection-end-line="17" selection-end-column="39" />
599 732
         </state>
600 733
       </provider>
601 734
     </entry>
602
-    <entry file="file://$PROJECT_DIR$/controllers/article/router_collector.go">
735
+    <entry file="file://$PROJECT_DIR$/routers/router.go">
603 736
       <provider selected="true" editor-type-id="text-editor">
604
-        <state relative-caret-position="66">
605
-          <caret line="3" column="18" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="18" />
737
+        <state relative-caret-position="150">
738
+          <caret line="25" column="109" selection-start-line="25" selection-start-column="86" selection-end-line="25" selection-end-column="109" />
606 739
         </state>
607 740
       </provider>
608 741
     </entry>
609
-    <entry file="file://$PROJECT_DIR$/controllers/article/article_controller.go">
742
+    <entry file="file://$PROJECT_DIR$/main.go">
610 743
       <provider selected="true" editor-type-id="text-editor">
611
-        <state relative-caret-position="1144">
612
-          <caret line="64" column="37" selection-start-line="64" selection-start-column="16" selection-end-line="64" selection-end-column="37" />
744
+        <state relative-caret-position="275">
745
+          <caret line="18" column="14" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
746
+          <folding>
747
+            <element signature="e#14#132#0" expanded="true" />
748
+          </folding>
613 749
         </state>
614 750
       </provider>
615 751
     </entry>
616
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
752
+    <entry file="file://$PROJECT_DIR$/controllers/staff/staff_controller.go">
617 753
       <provider selected="true" editor-type-id="text-editor">
618
-        <state relative-caret-position="198">
619
-          <caret line="9" selection-start-line="9" selection-end-line="9" />
754
+        <state relative-caret-position="3275">
755
+          <caret line="141" column="62" selection-start-line="141" selection-start-column="47" selection-end-line="141" selection-end-column="62" />
620 756
         </state>
621 757
       </provider>
622 758
     </entry>
623
-    <entry file="file://$PROJECT_DIR$/controllers/micro/router_collector.go">
759
+    <entry file="file://$PROJECT_DIR$/service/staff_service/staff_manager_service.go">
624 760
       <provider selected="true" editor-type-id="text-editor">
625
-        <state relative-caret-position="132">
626
-          <caret line="6" column="16" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="16" />
761
+        <state relative-caret-position="130">
762
+          <caret line="29" column="19" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
627 763
         </state>
628 764
       </provider>
629 765
     </entry>
630
-    <entry file="file://$PROJECT_DIR$/controllers/micro/micro_controller.go">
766
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
631 767
       <provider selected="true" editor-type-id="text-editor">
632
-        <state relative-caret-position="101">
633
-          <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
634
-          <folding>
635
-            <element signature="e#15#104#0" expanded="true" />
636
-          </folding>
768
+        <state relative-caret-position="2975">
769
+          <caret line="119" column="16" selection-start-line="119" selection-start-column="16" selection-end-line="119" selection-end-column="16" />
637 770
         </state>
638 771
       </provider>
639 772
     </entry>
640
-    <entry file="file://$PROJECT_DIR$/routers/router.go">
773
+    <entry file="file://$PROJECT_DIR$/models/purview_models.go">
641 774
       <provider selected="true" editor-type-id="text-editor">
642
-        <state relative-caret-position="154">
643
-          <caret line="35" column="26" selection-start-line="35" selection-start-column="11" selection-end-line="35" selection-end-column="26" />
775
+        <state relative-caret-position="350">
776
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="28" />
644 777
         </state>
645 778
       </provider>
646 779
     </entry>
647
-    <entry file="file://$PROJECT_DIR$/controllers/base_controller.go">
780
+    <entry file="file://$PROJECT_DIR$/controllers/role/role_controller.go">
648 781
       <provider selected="true" editor-type-id="text-editor">
649
-        <state relative-caret-position="44">
650
-          <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
782
+        <state relative-caret-position="178">
783
+          <caret line="184" column="77" selection-start-line="184" selection-start-column="45" selection-end-line="184" selection-end-column="77" />
651 784
         </state>
652 785
       </provider>
653 786
     </entry>
654
-    <entry file="file://$PROJECT_DIR$/controllers/base_api_controller.go">
787
+    <entry file="file://$PROJECT_DIR$/service/role_service/role_service.go">
655 788
       <provider selected="true" editor-type-id="text-editor">
656
-        <state relative-caret-position="-152">
657
-          <caret line="48" column="35" selection-start-line="48" selection-start-column="35" selection-end-line="48" selection-end-column="35" />
789
+        <state relative-caret-position="267">
790
+          <caret line="317" column="83" selection-start-line="317" selection-start-column="83" selection-end-line="317" selection-end-column="83" />
658 791
         </state>
659 792
       </provider>
660 793
     </entry>

+ 2 - 1
conf/app.conf Ver arquivo

@@ -1,5 +1,5 @@
1 1
 appname = SCRM
2
-httpport = 9535
2
+httpport = 9534
3 3
 runmode =  dev
4 4
 
5 5
 copyrequestbody = true
@@ -38,6 +38,7 @@ mchid = "1509573721"
38 38
 key = "e4SHrkiZu0pQEwVoGBapDBTf9N1Q6MxV"
39 39
 appsecret="61ee2e6268497d5aa9de0b0187c39aea"
40 40
 
41
+
41 42
 [prod]
42 43
 httpdomain = http://api.scrm.kuyicloud.com
43 44
 sso_domain = https://sso.kuyicloud.com

+ 2 - 0
controllers/admin_user/admin_controller.go Ver arquivo

@@ -11,6 +11,7 @@ import (
11 11
 	"time"
12 12
 
13 13
 	"github.com/astaxie/beego"
14
+	"fmt"
14 15
 )
15 16
 
16 17
 func AdminCtlRegistRouters() {
@@ -99,6 +100,7 @@ func (this *AdminController) ModifyPwd() {
99 100
 	redisClient := base_service.RedisClient()
100 101
 	defer redisClient.Close()
101 102
 	cachedCode, err := redisClient.Get("scrm_verification_code_" + mobile).Result()
103
+	fmt.Println("hhhhhhhhhhhhhh",cachedCode)
102 104
 	if err != nil {
103 105
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAccountOrVerCodeWrong)
104 106
 		return

+ 4 - 1
controllers/admin_user/org_controller.go Ver arquivo

@@ -12,6 +12,7 @@ import (
12 12
 	"time"
13 13
 
14 14
 	"github.com/astaxie/beego"
15
+	"fmt"
15 16
 )
16 17
 
17 18
 func OrgInfoCtlRegistRouters() {
@@ -28,8 +29,10 @@ type OrgInfoApiController struct {
28 29
 func (c *OrgInfoApiController) GetOrgInfo() {
29 30
 
30 31
 	adminUserInfo := c.GetAdminUserInfo()
31
-
32
+    fmt.Println("adminUserInfo是什么",adminUserInfo)
32 33
 	orgInfo := adminUserInfo.Orgs[adminUserInfo.CurrentOrgId]
34
+	fmt.Println("orgInfo是设么",orgInfo)
35
+	fmt.Println("orgInfo是什么",orgInfo.Province)
33 36
 	provinces, _ := district_service.GetDistrictsByUpid(0)
34 37
 	var citys []*models.District
35 38
 	var districts []*models.District

+ 0 - 1
controllers/base_api_controller.go Ver arquivo

@@ -77,7 +77,6 @@ func (this *BaseAuthAPIController) Prepare() {
77 77
 		adminUserInfo.AdminUser = &userAdmin
78 78
 		adminUserInfo.Subscibes = subscibes
79 79
 		this.SetSession("admin_user_info", &adminUserInfo)
80
-
81 80
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
82 81
 		this.StopRun()
83 82
 	}

+ 2 - 0
controllers/global/qiniu_controller.go Ver arquivo

@@ -18,10 +18,12 @@ func QiniuCtlRegistRouters() {
18 18
 }
19 19
 
20 20
 func (c *QiNiuApiController) GetQNUpToken() {
21
+	fmt.Println("==========================================")
21 22
 	redisClient := base_service.RedisClient()
22 23
 	defer redisClient.Close()
23 24
 
24 25
 	token, err := redisClient.Get("qn_token").Result()
26
+	fmt.Println("token是什么",token)
25 27
 	if err != nil {
26 28
 		defer fmt.Println(err)
27 29
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGetQiniuUpToken)

+ 1 - 1
controllers/micro/micro_controller.go Ver arquivo

@@ -8,7 +8,6 @@ import (
8 8
 )
9 9
 
10 10
 func microRouters(){
11
-	fmt.Println("ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo")
12 11
 	beego.Router("/api/site/getdatabyorgid",&Micro{},"Get:GetDataByOrgId")
13 12
 	beego.Router("/api/site/getdatatwo",&Micro{},"Get:GetDatatwo")
14 13
 	beego.Router("/api/site/getdatathree",&Micro{},"Get:GetOfficeDetail")
@@ -352,3 +351,4 @@ func (this *Micro) GetAllDoctors()  {
352 351
 		"info":info,
353 352
 	})
354 353
 }
354
+

+ 0 - 3
controllers/micro/router_collector.go Ver arquivo

@@ -1,8 +1,5 @@
1 1
 package micro
2 2
 
3
-import "fmt"
4
-
5 3
 func RegisterRouters() {
6
-	fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
7 4
 	microRouters()
8 5
 }

+ 42 - 0
controllers/register/reigster_contrller.go Ver arquivo

@@ -0,0 +1,42 @@
1
+package register
2
+
3
+import (
4
+	"github.com/astaxie/beego"
5
+	"fmt"
6
+	"SCRM/service/login_service"
7
+	"SCRM/enums"
8
+)
9
+
10
+func LoginRouter() {
11
+
12
+	beego.Router("/api/site/gettologin",&LoginManagement{},"Post:GetToLogin")
13
+}
14
+
15
+type LoginManagement struct {
16
+	beego.Controller
17
+}
18
+func (this *LoginManagement) ServeFailJsonSend(code int, msg string) {
19
+	this.Data["json"] = enums.MakeFailResponseJSON(msg, code)
20
+	this.ServeJSON()
21
+}
22
+
23
+func (this *LoginManagement) ServeSuccessJSON(data map[string]interface{}) {
24
+	this.Data["json"] = enums.MakeSuccessResponseJSON(data)
25
+	this.ServeJSON()
26
+}
27
+
28
+func (this *LoginManagement) GetToLogin()  {
29
+	tel := this.GetString("tel")
30
+	fmt.Println("哈哈tel是设么",tel)
31
+	psd := this.GetString("psd")
32
+	fmt.Println("psd是设么",psd)
33
+	admin, err := login_service.QueryLogin(tel, psd)
34
+	fmt.Println("错误是设么",err)
35
+	if err !=nil{
36
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "删除回复成功")
37
+		return
38
+	}
39
+	this.ServeSuccessJSON(map[string]interface{}{
40
+		"admin":admin,
41
+	})
42
+}

+ 5 - 0
controllers/register/router_collector.go Ver arquivo

@@ -0,0 +1,5 @@
1
+package register
2
+
3
+func RegisterRouter() {
4
+	LoginRouter()
5
+}

+ 10 - 2
controllers/staff/staff_controller.go Ver arquivo

@@ -167,24 +167,28 @@ func (this *StaffManage) EditStaffInfo()  {
167 167
 		return
168 168
 	}
169 169
 	staffname := dataBody["name"].(string)
170
+	fmt.Println("staffname",staffname)
170 171
 	if len(staffname) == 0 {
171 172
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "姓名不能为空")
172 173
 		return
173 174
 	}
174 175
 
175 176
 	phone := dataBody["phone"].(string)
177
+	fmt.Println("phone",phone)
176 178
 	if len(phone) == 0 {
177 179
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "手机不能为空")
178 180
 		return
179 181
 	}
180 182
 
181 183
 	gender := int64(dataBody["gender"].(float64))
184
+	fmt.Println("gender",gender)
182 185
 	if gender <= 0{
183 186
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "性别不能为空")
184 187
 		return
185 188
 	}
186 189
 
187 190
 	birthday, _ := dataBody["birthday"].(string)
191
+	fmt.Println("birthday",birthday)
188 192
 	if len(birthday) == 0 {
189 193
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "生日格式不正确")
190 194
 		return
@@ -201,22 +205,25 @@ func (this *StaffManage) EditStaffInfo()  {
201 205
 	fmt.Println("生日",staffbirthday)
202 206
 
203 207
 	userType := int64(dataBody["user_type"].(float64))
204
-
208
+   fmt.Println("userType",userType)
205 209
 	if userType <= 0 {
206 210
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "职称类型不正确")
207 211
 		return
208 212
 	}
209 213
 	userTitle :=int64(dataBody["user_title"].(float64))
214
+	fmt.Println("userTitle",userTitle)
210 215
 	if userTitle <= 0 {
211 216
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "职称名称不正确")
212 217
 		return
213 218
 	}
214 219
 	dochead := dataBody["dochead"].(string)
220
+	fmt.Println("dochead",dochead)
215 221
 	if len(dochead) == 0 {
216 222
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "头像不正确")
217 223
 		return
218 224
 	}
219 225
 	content := dataBody["content"].(string)
226
+	fmt.Println("content",content)
220 227
 	if len(content) == 0 {
221 228
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "头像不正确")
222 229
 		return
@@ -238,7 +245,8 @@ func (this *StaffManage) EditStaffInfo()  {
238 245
 		Mtime:time.Now().Unix(),
239 246
 	}
240 247
 	fmt.Println(StaffInfo)
241
-	staff_service.UpdateStaffInfo(StaffInfo,userOrgID,id)
248
+	err = staff_service.UpdateStaffInfo(StaffInfo, userOrgID, id)
249
+	fmt.Println("err",err)
242 250
 	this.ServeSuccessJSON(map[string]interface{}{
243 251
 		"userStaffInfo":StaffInfo,
244 252
 	})

+ 3 - 0
jobcron/qiniu_job.go Ver arquivo

@@ -23,10 +23,12 @@ func RequestQNToken() {
23 23
 	accessKey := beego.AppConfig.String("qiniu_accesskey")
24 24
 	secretKey := beego.AppConfig.String("qiniu_secretkey")
25 25
 	bucket := beego.AppConfig.String("qiniu_bucket")
26
+	fmt.Println("bucket",bucket)
26 27
 	putPolicy := storage.PutPolicy{
27 28
 		Scope:      bucket,
28 29
 		ReturnBody: `{"url":"$(key)","hash":"$(etag)","state":"SUCCESS"}`,
29 30
 	}
31
+	fmt.Println("putpolicy",putPolicy)
30 32
 	putPolicy.Expires = 7200
31 33
 	mac := qbox.NewMac(accessKey, secretKey)
32 34
 	upToken := putPolicy.UploadToken(mac)
@@ -38,5 +40,6 @@ func RequestQNToken() {
38 40
 }
39 41
 
40 42
 func BeginRerequestQNTokenCronJob() {
43
+	fmt.Println("七牛开始垃圾==========================")
41 44
 	qnTokenCronJob.Start()
42 45
 }

+ 19 - 0
models/login_models.go Ver arquivo

@@ -0,0 +1,19 @@
1
+package models
2
+
3
+type SgjUserAdmin struct {
4
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
5
+	Mobile string `gorm:"column:mobile" json:"mobile" form:"mobile"`
6
+	Password string `gorm:"column:password" json:"password" form:"password"`
7
+	IsSuperAdmin int64 `gorm:"column:is_super_admin" json:"is_super_admin" form:"is_super_admin"`
8
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
9
+	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
10
+	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
11
+	Source int64 `gorm:"column:source" json:"source" form:"source"`
12
+	Ttype int64 `gorm:"column:ttype" json:"ttype" form:"ttype"`
13
+	Ttid int64 `gorm:"column:ttid" json:"ttid" form:"ttid"`
14
+	Tuid int64 `gorm:"column:tuid" json:"tuid" form:"tuid"`
15
+}
16
+
17
+func (SgjUserAdmin) TableName() string {
18
+	return "sgj_user_admin"
19
+}

+ 3 - 0
models/site_models.go Ver arquivo

@@ -554,4 +554,7 @@ func (PatientNavgationlink) TableName() string  {
554 554
 
555 555
 type OrgInfo struct {
556 556
 	ID  int64
557
+	OrgIntroduction string
558
+	Telephone  string
559
+	Address    string
557 560
 }

+ 23 - 10
models/wechat_models.go Ver arquivo

@@ -41,18 +41,31 @@ func (PatientAuthorizations) TableName() string {
41 41
 	return "sgj_patient_authorizations"
42 42
 }
43 43
 
44
+//type AuthorizationMessageManagements struct {
45
+//	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
46
+//	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
47
+//	MessageMsgEvent    string `gorm:"column:message_msg_event" json:"message_msg_event" form:"message_msg_event"`
48
+//	MessageMsgType     string `gorm:"column:message_msg_type" json:"message_msg_type" form:"message_msg_type"`
49
+//	MessageKeyType     int64  `gorm:"column:message_key_type" json:"message_key_type" form:"message_key_type"`
50
+//	MessageRegularName string `gorm:"column:message_regular_name" json:"message_regular_name" form:"message_regular_name"`
51
+//	MessageKeyName     string `gorm:"column:message_key_name" json:"message_key_name" form:"message_key_name"`
52
+//	MessageContent     string `gorm:"column:message_content" json:"message_content" form:"message_content"`
53
+//	CreatedTime        int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
54
+//	UpdatedTime        int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
55
+//	MessageStatus      int64  `gorm:"column:message_status" json:"message_status" form:"message_status"`
56
+//}
44 57
 type AuthorizationMessageManagements struct {
45
-	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
46
-	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
47
-	MessageMsgEvent    string `gorm:"column:message_msg_event" json:"message_msg_event" form:"message_msg_event"`
48
-	MessageMsgType     string `gorm:"column:message_msg_type" json:"message_msg_type" form:"message_msg_type"`
49
-	MessageKeyType     int64  `gorm:"column:message_key_type" json:"message_key_type" form:"message_key_type"`
58
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
59
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
60
+	MessageMsgEvent string `gorm:"column:message_msg_event" json:"message_msg_event" form:"message_msg_event"`
61
+	MessageMsgType string `gorm:"column:message_msg_type" json:"message_msg_type" form:"message_msg_type"`
62
+	MessageKeyType int64 `gorm:"column:message_key_type" json:"message_key_type" form:"message_key_type"`
50 63
 	MessageRegularName string `gorm:"column:message_regular_name" json:"message_regular_name" form:"message_regular_name"`
51
-	MessageKeyName     string `gorm:"column:message_key_name" json:"message_key_name" form:"message_key_name"`
52
-	MessageContent     string `gorm:"column:message_content" json:"message_content" form:"message_content"`
53
-	CreatedTime        int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
54
-	UpdatedTime        int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
55
-	MessageStatus      int64  `gorm:"column:message_status" json:"message_status" form:"message_status"`
64
+	MessageKeyName string `gorm:"column:message_key_name" json:"message_key_name" form:"message_key_name"`
65
+	MessageContent string `gorm:"column:message_content" json:"message_content" form:"message_content"`
66
+	CreatedTime int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
67
+	UpdatedTime int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
68
+	MessageStatus int64 `gorm:"column:message_status" json:"message_status" form:"message_status"`
56 69
 }
57 70
 
58 71
 func (AuthorizationMessageManagements) TableName() string {

+ 2 - 2
routers/router.go Ver arquivo

@@ -18,11 +18,10 @@ import (
18 18
 	"SCRM/controllers/site"
19 19
 	"SCRM/controllers/micro"
20 20
 	"github.com/astaxie/beego/context"
21
-	"fmt"
21
+	"SCRM/controllers/register"
22 22
 )
23 23
 
24 24
 func init() {
25
-	fmt.Println("开始啦看hi啊啊阿道夫放大阿发大是大非身份地方阿斯蒂芬撒旦法暗室逢灯沙发发顺丰阿萨法撒旦法沙发阿萨法阿发法啊阿打发打发")
26 25
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
27 26
 		AllowOrigins:     []string{"http://jk.kuyicloud.com", "http://localhost:8090","http://localhost:8091", "http://test1.sgjyun.com", "https://www.ucpaas.com","http://microweb.kuyicloud.com","http://jk.test.sgjyun.com"},
28 27
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
@@ -46,4 +45,5 @@ func init() {
46 45
 	kefu.RegisterRouters()
47 46
 	site.RegisterRouters()
48 47
 	micro.RegisterRouters()
48
+	register.RegisterRouter()
49 49
 }

+ 4 - 5
service/db.go Ver arquivo

@@ -17,18 +17,17 @@
17 17
 package service
18 18
 
19 19
 import (
20
-	"fmt"
20
+"fmt"
21 21
 
22
-	"github.com/astaxie/beego"
23
-	"github.com/jinzhu/gorm"
24
-	_ "github.com/jinzhu/gorm/dialects/mysql" // mysql
22
+"github.com/astaxie/beego"
23
+"github.com/jinzhu/gorm"
24
+_ "github.com/jinzhu/gorm/dialects/mysql" // mysql
25 25
 )
26 26
 
27 27
 var readDb *gorm.DB
28 28
 var writeDb *gorm.DB
29 29
 var readUserDb *gorm.DB
30 30
 var writeUserDb *gorm.DB
31
-
32 31
 var err error
33 32
 
34 33
 func ConnectDB() {

+ 15 - 0
service/login_service/login_service.go Ver arquivo

@@ -0,0 +1,15 @@
1
+package login_service
2
+
3
+import (
4
+	"fmt"
5
+	"SCRM/models"
6
+	"SCRM/service"
7
+)
8
+
9
+func QueryLogin(tel string,psd string)(models.SgjUserAdmin,error)  {
10
+	fmt.Println("bbbbbbbbbbbbbbbbbbbb")
11
+	admin := models.SgjUserAdmin{}
12
+	err := service.UserReadDB().Where("mobile = ? AND password = ? AND status = ?", tel, psd, 1).Find(&admin).Error
13
+	return admin,err
14
+}
15
+

+ 3 - 3
service/redis.go Ver arquivo

@@ -1,10 +1,10 @@
1 1
 package service
2 2
 
3 3
 import (
4
-	"fmt"
4
+"fmt"
5 5
 
6
-	"github.com/astaxie/beego"
7
-	"github.com/go-redis/redis"
6
+"github.com/astaxie/beego"
7
+"github.com/go-redis/redis"
8 8
 )
9 9
 
10 10
 func RedisClient() *redis.Client {

+ 1 - 1
service/role_service/role_service.go Ver arquivo

@@ -315,7 +315,7 @@ type PurviewTreeViewModel struct {
315 315
 
316 316
 func GetAllGeneralPurviewVMsProcessed() ([]*PurviewTreeViewModel, error) {
317 317
 	var originPurviews []*models.Purview
318
-	getPurviewErr := service.UserReadDB().Model(models.Purview{}).Where("module = 3 AND status = 1 AND super_admin_exclusive = 0").Order("listorder asc").Order("id asc").Find(&originPurviews).Error
318
+	getPurviewErr := service.UserReadDB().Model(models.Purview{}).Where("module = 6 AND status = 1 AND super_admin_exclusive = 0").Order("listorder asc").Order("id asc").Find(&originPurviews).Error
319 319
 	if getPurviewErr != nil {
320 320
 		return nil, getPurviewErr
321 321
 	}

+ 6 - 3
service/site_service/site_microwebsite_service.go Ver arquivo

@@ -41,6 +41,9 @@ func AutoCreateDefalutSchedules()  {
41 41
     fmt.Println("orginfo",orginfo)
42 42
 	for i:=0;i< len(orginfo);i++  {
43 43
 		userOrgID := orginfo[i].ID
44
+		orgintroduction := orginfo[i].OrgIntroduction
45
+		telephone := orginfo[i].Telephone
46
+		address := orginfo[i].Address
44 47
 		fmt.Println("ID是设么",userOrgID)
45 48
 		navigation, err := GetPatientNavigation(userOrgID)
46 49
 		fmt.Println("err",err)
@@ -296,7 +299,7 @@ func AutoCreateDefalutSchedules()  {
296 299
 			hospital := models.SgjPatientHospital{
297 300
 				Title:        "医院介绍",
298 301
 				Sort:         4,
299
-				Introduction: "",
302
+				Introduction: orgintroduction,
300 303
 				UserOrgId:    userOrgID,
301 304
 				Modleid:      sgjPatientModelTwo.ID,
302 305
 				Status:       1,
@@ -477,7 +480,7 @@ func AutoCreateDefalutSchedules()  {
477 480
 			hosaddress := models.SgjPatientHosaddress{
478 481
 				Title:     "医院地址",
479 482
 				UserOrgId: userOrgID,
480
-				Address:   "暂无数据",
483
+				Address:   address,
481 484
 				Ctime:     time.Now().Unix(),
482 485
 				Status:    1,
483 486
 				Modeid:    patientOrdmodelOne.ID,
@@ -505,7 +508,7 @@ func AutoCreateDefalutSchedules()  {
505 508
 			connection := models.SgjPatientConnection{
506 509
 				Title:     "电话",
507 510
 				Connecway: 1,
508
-				Content:   "暂无数据",
511
+				Content:   telephone,
509 512
 				Status:    1,
510 513
 				UserOrgId: userOrgID,
511 514
 			}

+ 3 - 2
service/staff_service/staff_manager_service.go Ver arquivo

@@ -33,8 +33,9 @@ func  GetAllStaffInfo(orgID int64,page int64,limit int64,keyword string)(userSta
33 33
 	return
34 34
 }
35 35
 
36
-func UpdateStaffInfo(info models.SgjUserStaffInfo,OrgID int64,id int64)  {
37
-	 service.UserWriteDB().Model(info).Where("user_org_id = ? AND id =? AND status = ?",OrgID,id,1).Update(map[string]interface{}{"Name":info.Name,"phone":info.Phone,"birthday":info.Birthday,"gender":info.Gender,"user_type":info.UserType,"user_title":info.UserTitle,"dochead":info.Dochead,"content":info.Content,"mtime":info.Mtime})
36
+func UpdateStaffInfo(info models.SgjUserStaffInfo,OrgID int64,id int64) error {
37
+	err := service.UserWriteDB().Model(&info).Where("user_org_id = ? AND id =? AND status = ?", OrgID, id, 1).Update(map[string]interface{}{"Name": info.Name, "phone": info.Phone, "birthday": info.Birthday, "gender": info.Gender, "user_type": info.UserType, "user_title": info.UserTitle, "dochead": info.Dochead, "content": info.Content, "mtime": info.Mtime}).Error
38
+	return err
38 39
 }
39 40
 
40 41
 func DeleteStaffs(orgID int64,ids[] int64)(err error) {