Merge branch 'dev' into test

.gitignore

@@ -28,5 +28,6 @@
 .vscode
 config/base.config.json
 
-src/global/config/global.d.ts 
-src/services/*Api.ts
\ No newline at end of file
+src/global/config/global.d.ts
+src/services/*Api.ts
+src/services/*Api

package.json

@@ -94,7 +94,7 @@
     "fs-extra": "^9.0.1",
     "glob": "^7.1.6",
     "god-upload-scp": "^1.2.0",
-    "god-yapi2ts": "^1.6.0",
+    "god-yapi2ts": "1.9.0",
     "gulp": "^4.0.2",
     "gulp-git": "^2.10.1",
     "http-proxy-middleware": "^1.0.5",

src/pages/user/index.tsx

@@ -12,7 +12,6 @@ import { Link, history, Helmet } from 'umi'
 import ScanLoginWrap from './components/ScanLoginWrap';
 // import leftPicture from '../../../mockStatic/image_ad.png'
 import { PublicApi } from '@/services/api'
-import { GetManageContentImageFindAllByUseSceneAndPositionResponse } from '@/services/PassApi'
 import wechat from '../../../mockStatic/Wechat.png'
 import qq from '../../../mockStatic/QQ.png'
 import alipay from '../../../mockStatic/Alipay.png'
@@ -20,7 +19,7 @@ import LoginWrap from './components/LoginWrap'
 
 const User: React.FC = () => {
   const [isScanQrCode, setIsScanQrCode] = useState(false)
-  const [sceneList, setSceneList] = useState<GetManageContentImageFindAllByUseSceneAndPositionResponse>()
+  const [sceneList, setSceneList] = useState<any>()
 
   const handleGuideLogin = (param: boolean) => {
     setIsScanQrCode(param)

src/services/api.ts

 import * as LogisticsApi from './LogisticsApi'
 import * as PassApi from './PassApi'
 import * as WarehouseApi from './WarehouseApi'
-import * as MemberApi from './MemberApi'
+import * as MemberApi from './memberApi'
 import * as ProductApi from './ProductApi'
 import * as TemplateApi from './TemplateApi'
 import * as PayApi from './PayApi'
@@ -9,8 +9,8 @@ import * as SearchApi from './SearchApi'
 import * as OrderApi from './OrderApi'
 import * as SettleApi from './SettleApi'
 import * as AfterService from './AfterServiceApi'
-import * as EnhanceApi from './EnhanceApi'; 
-import * as ReportApi from './ReportApi'; 
+import * as EnhanceApi from './EnhanceApi';
+import * as ReportApi from './ReportApi';
 
 /**
  * 可在这里写入自定义的接口

ytt.config.ts

 const tokenList = [
-  { name: 'Pass', token: 'b063a0a29fb1a570d9f00eaabbdd8ccfe8e6e10e24739441990cc1098e79b601' }, // 业务中台管理平台
-  { name: 'Warehouse', token: '7c8f235d95f6224ceb97c4d832b09658f9a75fb8721a95699b230af0733d7fa4' }, // 仓库服务
-  { name: 'Logistics', token: '8d14d945507d1f8cd89afe139ca6d111bbad25f702fafe0aec59d3c9cd2e0ffe' },  // 物流服务
-  { name: 'Member', token: 'c0e920f071595a73ba234b6fa6cfe42192d3d740d59f030caa2c7f0f08777d78' },  // 商户会员管理服务
-  { name: 'Product', token: 'dbfeae0baf614a6dd8f1de2b1403444cdfa9c052a3757da6a0d6d7d52fb26178' },  // 商品服务
-  { name: 'Template', token: '7ec923520215c7e2f771867cb4d29cafbf823daf0fb2d3d9fa70b57a523c8bfb' },  // 店铺模板服务
-  { name: 'Pay', token: '34608cd33222b1650795459d73b8eb0b260eb92cf5e8d1e646f85a4875e36f05' }, // 支付服务
-  { name: 'Search', token: 'ca19f532efba91f7773cbfbd526b798c6ac83df670071e97d72c50dca1d53a48' },  // 搜索服务
-  { name: 'Order', token: '31b93b223421ca52389b088a7457c651fab7c1bf658fc7dd38d0689d09c8e235' },  //订单服务
-  { name: 'Settle', token: 'fffbeeaaa198c285955997c606bc279fc6950fea118580c786f2c73eecccaa6a' },  //结算服务
-  { name: 'AfterService', token: '39db719680bf1b3db21bc1deda933cde16d17559e9676bf848ec96c1320e68df' }, // '售后服务' 
-  // { name: '', token: 'c0e920f071595a73ba234b6fa6cfe42192d3d740d59f030caa2c7f0f08777d78' } // 商户会员管理服务
-  { name: 'Enhance', token: '594a7e7ff17f6f40fb9fb726c1da9a3f282a926a8d386eb6cbfd668a3f75f251'}, // 加工服务
-  { name: 'Report', token: '69ee5a79363c763ded1a2eb42952a5181ffcdfc5ffb93b6e1e22ac92a25b38bf'}, // 报表服务
+  { name: 'Pass', token: 'b063a0a29fb1a570d9f00eaabbdd8ccfe8e6e10e24739441990cc1098e79b601', categoryIds: [0], }, // 业务中台管理平台
+  { name: 'Warehouse', token: '7c8f235d95f6224ceb97c4d832b09658f9a75fb8721a95699b230af0733d7fa4', categoryIds: [0], }, // 仓库服务
+  { name: 'Logistics', token: '8d14d945507d1f8cd89afe139ca6d111bbad25f702fafe0aec59d3c9cd2e0ffe', categoryIds: [0], },  // 物流服务
+  { name: 'Member', token: 'c0e920f071595a73ba234b6fa6cfe42192d3d740d59f030caa2c7f0f08777d78', categoryIds: [0], },  // 商户会员管理服务
+  { name: 'Product', token: 'dbfeae0baf614a6dd8f1de2b1403444cdfa9c052a3757da6a0d6d7d52fb26178', categoryIds: [0], },  // 商品服务
+  { name: 'Template', token: '7ec923520215c7e2f771867cb4d29cafbf823daf0fb2d3d9fa70b57a523c8bfb', categoryIds: [0], },  // 店铺模板服务
+  { name: 'Pay', token: '34608cd33222b1650795459d73b8eb0b260eb92cf5e8d1e646f85a4875e36f05', categoryIds: [0], }, // 支付服务
+  { name: 'Search', token: 'ca19f532efba91f7773cbfbd526b798c6ac83df670071e97d72c50dca1d53a48', categoryIds: [0], },  // 搜索服务
+  { name: 'Order', token: '31b93b223421ca52389b088a7457c651fab7c1bf658fc7dd38d0689d09c8e235', categoryIds: [0], },  //订单服务
+  { name: 'Settle', token: 'fffbeeaaa198c285955997c606bc279fc6950fea118580c786f2c73eecccaa6a', categoryIds: [0], },  //结算服务
+  { name: 'AfterService', token: '39db719680bf1b3db21bc1deda933cde16d17559e9676bf848ec96c1320e68df', categoryIds: [0], }, // '售后服务'
+  { name: 'Enhance', token: '594a7e7ff17f6f40fb9fb726c1da9a3f282a926a8d386eb6cbfd668a3f75f251', categoryIds: [0], }, // 加工服务
+  { name: 'Report', token: '69ee5a79363c763ded1a2eb42952a5181ffcdfc5ffb93b6e1e22ac92a25b38bf', categoryIds: [0], }, // 报表服务
 ]
 
 const getConfigMap = (tokens) => tokens.map(v => ({
@@ -21,7 +20,7 @@ const getConfigMap = (tokens) => tokens.map(v => ({
   reactHooks: {
     enabled: false,
   },
-  outputFilePath: `src/services/${v.name}Api.ts`,
+  outputFilePath: `src/services/${v.name}Api`,
   requestFunctionFilePath: 'request.ts',
   dataKey: 'data',
   projects: [
@@ -29,7 +28,7 @@ const getConfigMap = (tokens) => tokens.map(v => ({
       token: v.token,
       categories: [
         {
-          id: 0,
+          id: v.categoryIds,
           getRequestFunctionName(interfaceInfo, changeCase) {
             return changeCase.camelCase(interfaceInfo.method + interfaceInfo.path)
           },
@@ -39,4 +38,4 @@ const getConfigMap = (tokens) => tokens.map(v => ({
   ],
 }))
 
-export default getConfigMap(tokenList)
\ No newline at end of file
+export default getConfigMap(tokenList)