ts-glitter 22.4.4 → 22.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lowcode/Entry.js +1 -1
- package/lowcode/Entry.ts +1 -1
- package/lowcode/cms-plugin/sms-points.js +5 -1
- package/lowcode/cms-plugin/sms-points.ts +6 -1
- package/lowcode/glitter-base/route/sms-points-api.js +2 -0
- package/lowcode/glitter-base/route/sms-points-api.ts +5 -3
- package/lowcode/view-model/saas-view-model.js +3 -1
- package/lowcode/view-model/saas-view-model.ts +3 -1
- package/package.json +1 -1
- package/src/api-public/controllers/sms-points.js +11 -0
- package/src/api-public/controllers/sms-points.js.map +1 -1
- package/src/api-public/controllers/sms-points.ts +11 -1
- package/src/api-public/services/sms-pointes.d.ts +1 -0
- package/src/api-public/services/sms-pointes.js +6 -9
- package/src/api-public/services/sms-pointes.js.map +1 -1
- package/src/api-public/services/sms-pointes.ts +11 -11
package/lowcode/Entry.js
CHANGED
|
@@ -154,7 +154,7 @@ export class Entry {
|
|
|
154
154
|
}
|
|
155
155
|
window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
|
|
156
156
|
console.log(`Entry-time:`, window.renderClock.stop());
|
|
157
|
-
glitter.share.editerVersion = 'V_22.4.
|
|
157
|
+
glitter.share.editerVersion = 'V_22.4.5';
|
|
158
158
|
glitter.share.start = new Date();
|
|
159
159
|
const vm = { appConfig: [] };
|
|
160
160
|
window.saasConfig = {
|
package/lowcode/Entry.ts
CHANGED
|
@@ -159,7 +159,7 @@ export class Entry {
|
|
|
159
159
|
}
|
|
160
160
|
(window as any).renderClock = (window as any).renderClock ?? createClock();
|
|
161
161
|
console.log(`Entry-time:`, (window as any).renderClock.stop());
|
|
162
|
-
glitter.share.editerVersion = 'V_22.4.
|
|
162
|
+
glitter.share.editerVersion = 'V_22.4.5';
|
|
163
163
|
glitter.share.start = new Date();
|
|
164
164
|
const vm = { appConfig: [] };
|
|
165
165
|
(window as any).saasConfig = {
|
|
@@ -33,7 +33,9 @@ export class SmsPoints {
|
|
|
33
33
|
loading: true,
|
|
34
34
|
sum: 0,
|
|
35
35
|
};
|
|
36
|
-
SmsPointsApi.getSum({
|
|
36
|
+
SmsPointsApi.getSum({
|
|
37
|
+
app_name: window.parent.appName
|
|
38
|
+
}).then((res) => {
|
|
37
39
|
vm.sum = parseInt(res.response.sum, 10);
|
|
38
40
|
vm.loading = false;
|
|
39
41
|
gvc.notifyDataChange(id);
|
|
@@ -110,6 +112,7 @@ export class SmsPoints {
|
|
|
110
112
|
return 'plus';
|
|
111
113
|
}
|
|
112
114
|
})(),
|
|
115
|
+
app_name: window.parent.appName
|
|
113
116
|
}).then((data) => {
|
|
114
117
|
function getDatalist() {
|
|
115
118
|
return data.response.data.map((dd) => {
|
|
@@ -173,6 +176,7 @@ export class SmsPoints {
|
|
|
173
176
|
company: '',
|
|
174
177
|
gui_number: '',
|
|
175
178
|
},
|
|
179
|
+
app_name: window.parent.appName
|
|
176
180
|
};
|
|
177
181
|
vm.user_info.email = vm.user_info.email || '';
|
|
178
182
|
const dd = yield ApiUser.getPublicConfig('ai-points-store', 'manager');
|
|
@@ -31,7 +31,9 @@ export class SmsPoints {
|
|
|
31
31
|
loading: true,
|
|
32
32
|
sum: 0,
|
|
33
33
|
};
|
|
34
|
-
SmsPointsApi.getSum({
|
|
34
|
+
SmsPointsApi.getSum({
|
|
35
|
+
app_name:(window.parent as any).appName
|
|
36
|
+
}).then((res: any) => {
|
|
35
37
|
vm.sum = parseInt(res.response.sum, 10);
|
|
36
38
|
vm.loading = false;
|
|
37
39
|
|
|
@@ -129,6 +131,7 @@ export class SmsPoints {
|
|
|
129
131
|
return 'plus';
|
|
130
132
|
}
|
|
131
133
|
})(),
|
|
134
|
+
app_name:(window.parent as any).appName
|
|
132
135
|
}).then((data: any) => {
|
|
133
136
|
function getDatalist() {
|
|
134
137
|
return data.response.data.map((dd: any) => {
|
|
@@ -193,6 +196,7 @@ export class SmsPoints {
|
|
|
193
196
|
company: string;
|
|
194
197
|
gui_number: string;
|
|
195
198
|
};
|
|
199
|
+
app_name:string
|
|
196
200
|
} = {
|
|
197
201
|
total: 500,
|
|
198
202
|
note: {},
|
|
@@ -203,6 +207,7 @@ export class SmsPoints {
|
|
|
203
207
|
company: '',
|
|
204
208
|
gui_number: '',
|
|
205
209
|
},
|
|
210
|
+
app_name:(window.parent as any).appName
|
|
206
211
|
};
|
|
207
212
|
vm.user_info.email = vm.user_info.email || '';
|
|
208
213
|
const dd = await ApiUser.getPublicConfig('ai-points-store', 'manager');
|
|
@@ -127,6 +127,7 @@ export class SmsPointsApi {
|
|
|
127
127
|
json.search && par.push(`search=${json.search}`);
|
|
128
128
|
json.id && par.push(`id=${json.id}`);
|
|
129
129
|
json.type && par.push(`type=${json.type}`);
|
|
130
|
+
json.app_name && par.push(`app_name=${json.app_name}`);
|
|
130
131
|
return par.join('&');
|
|
131
132
|
})()}`,
|
|
132
133
|
type: 'GET',
|
|
@@ -178,6 +179,7 @@ export class SmsPointsApi {
|
|
|
178
179
|
`/api-public/v1/sms/points/sum?${(() => {
|
|
179
180
|
let par = [];
|
|
180
181
|
json.userID && par.push(`userID=${json.userID}`);
|
|
182
|
+
json.app_name && par.push(`app_name=${json.app_name}`);
|
|
181
183
|
return par.join('&');
|
|
182
184
|
})()}`,
|
|
183
185
|
type: 'GET',
|
|
@@ -2,7 +2,7 @@ import { BaseApi } from '../../glitterBundle/api/base.js';
|
|
|
2
2
|
import { GlobalUser } from '../global/global-user.js';
|
|
3
3
|
|
|
4
4
|
export class SmsPointsApi {
|
|
5
|
-
public static store(json: { total: number; note: any; method?: any; return_url: string }) {
|
|
5
|
+
public static store(json: { total: number; note: any; method?: any; return_url: string ,app_name:string}) {
|
|
6
6
|
return BaseApi.create({
|
|
7
7
|
url: getBaseUrl() + `/api-public/v1/sms/points`,
|
|
8
8
|
type: 'POST',
|
|
@@ -126,7 +126,7 @@ export class SmsPointsApi {
|
|
|
126
126
|
});
|
|
127
127
|
}
|
|
128
128
|
|
|
129
|
-
public static get(json: { limit: number; page: number; search?: string; id?: string,type?:string }) {
|
|
129
|
+
public static get(json: { limit: number; page: number; search?: string; id?: string,type?:string,app_name:string }) {
|
|
130
130
|
return BaseApi.create({
|
|
131
131
|
url:
|
|
132
132
|
getBaseUrl() +
|
|
@@ -135,6 +135,7 @@ export class SmsPointsApi {
|
|
|
135
135
|
json.search && par.push(`search=${json.search}`);
|
|
136
136
|
json.id && par.push(`id=${json.id}`);
|
|
137
137
|
json.type && par.push(`type=${json.type}`);
|
|
138
|
+
json.app_name && par.push(`app_name=${json.app_name}`);
|
|
138
139
|
return par.join('&');
|
|
139
140
|
})()}`,
|
|
140
141
|
type: 'GET',
|
|
@@ -183,13 +184,14 @@ export class SmsPointsApi {
|
|
|
183
184
|
},
|
|
184
185
|
});
|
|
185
186
|
}
|
|
186
|
-
public static getSum(json: { userID?: string }) {
|
|
187
|
+
public static getSum(json: { userID?: string,app_name:string }) {
|
|
187
188
|
return BaseApi.create({
|
|
188
189
|
url:
|
|
189
190
|
getBaseUrl() +
|
|
190
191
|
`/api-public/v1/sms/points/sum?${(() => {
|
|
191
192
|
let par = [];
|
|
192
193
|
json.userID && par.push(`userID=${json.userID}`);
|
|
194
|
+
json.app_name && par.push(`app_name=${json.app_name}`);
|
|
193
195
|
return par.join('&');
|
|
194
196
|
})()}`,
|
|
195
197
|
type: 'GET',
|
|
@@ -116,7 +116,9 @@ export class SaasViewModel {
|
|
|
116
116
|
loading: true,
|
|
117
117
|
sum: 0,
|
|
118
118
|
};
|
|
119
|
-
SmsPointsApi.getSum({
|
|
119
|
+
SmsPointsApi.getSum({
|
|
120
|
+
app_name: window.parent.appName
|
|
121
|
+
}).then(res => {
|
|
120
122
|
vm.sum = parseInt(res.response.sum, 10);
|
|
121
123
|
vm.loading = false;
|
|
122
124
|
gvc.notifyDataChange(id);
|
|
@@ -111,7 +111,9 @@ export class SaasViewModel {
|
|
|
111
111
|
loading: true,
|
|
112
112
|
sum: 0,
|
|
113
113
|
};
|
|
114
|
-
SmsPointsApi.getSum({
|
|
114
|
+
SmsPointsApi.getSum({
|
|
115
|
+
app_name:(window.parent as any).appName
|
|
116
|
+
}).then(res => {
|
|
115
117
|
vm.sum = parseInt(res.response.sum, 10);
|
|
116
118
|
vm.loading = false;
|
|
117
119
|
|
package/package.json
CHANGED
|
@@ -13,11 +13,17 @@ const financial_service_js_1 = require("../services/financial-service.js");
|
|
|
13
13
|
const ut_database_js_1 = require("../utils/ut-database.js");
|
|
14
14
|
const invoice_js_1 = require("../services/invoice.js");
|
|
15
15
|
const sms_pointes_js_1 = require("../services/sms-pointes.js");
|
|
16
|
+
const app_js_1 = require("../../services/app.js");
|
|
16
17
|
const router = express_1.default.Router();
|
|
17
18
|
router.get('/', async (req, resp) => {
|
|
18
19
|
try {
|
|
19
20
|
const app = req.get('g-app');
|
|
20
21
|
let query = [];
|
|
22
|
+
if (req.query.app_name) {
|
|
23
|
+
const brand = await app_js_1.App.checkBrandAndMemberType(req.query.app_name);
|
|
24
|
+
req.query.userID = brand.user_id;
|
|
25
|
+
req.body.token.userID = brand.user_id;
|
|
26
|
+
}
|
|
21
27
|
if (await ut_permission_js_1.UtPermission.isManager(req)) {
|
|
22
28
|
req.query.search && query.push(`(userID in (select userID from \`${app}\`.t_user where (UPPER(JSON_UNQUOTE(JSON_EXTRACT(userData, '$.name')) LIKE UPPER('%${req.query.search}%')))))`);
|
|
23
29
|
}
|
|
@@ -52,6 +58,7 @@ router.post('/', async (req, resp) => {
|
|
|
52
58
|
total: req.body.total,
|
|
53
59
|
note: req.body.note,
|
|
54
60
|
method: req.body.method,
|
|
61
|
+
app_name: req.body.app_name
|
|
55
62
|
}));
|
|
56
63
|
}
|
|
57
64
|
catch (err) {
|
|
@@ -148,6 +155,10 @@ router.delete('/withdraw', async (req, resp) => {
|
|
|
148
155
|
router.get('/sum', async (req, resp) => {
|
|
149
156
|
try {
|
|
150
157
|
const app = req.get('g-app');
|
|
158
|
+
if (req.query.app_name) {
|
|
159
|
+
const brand = await app_js_1.App.checkBrandAndMemberType(req.query.app_name);
|
|
160
|
+
req.query.userID = brand.user_id;
|
|
161
|
+
}
|
|
151
162
|
return response_1.default.succ(resp, {
|
|
152
163
|
sum: (await database_js_1.default.query(`SELECT sum(money) FROM \`${app}\`.t_sms_points
|
|
153
164
|
WHERE status in (1, 2) AND userID = ?`, [req.query.userID || req.body.token.userID]))[0]['sum(money)'] || 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sms-points.js","sourceRoot":"","sources":["sms-points.ts"],"names":[],"mappings":";;;;AAAA,sDAA8B;AAC9B,oDAA4B;AAC5B,sEAA8C;AAC9C,wEAAgD;AAChD,4EAA2C;AAC3C,gEAAyD;AACzD,wEAAkE;AAClE,2EAAgE;AAChE,4DAAqD;AACrD,uDAA+C;AAC/C,+DAAqD;
|
|
1
|
+
{"version":3,"file":"sms-points.js","sourceRoot":"","sources":["sms-points.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import { EcPay, EzPay } from '../services/financial-service.js';
|
|
|
9
9
|
import { UtDatabase } from '../utils/ut-database.js';
|
|
10
10
|
import {Invoice} from "../services/invoice.js";
|
|
11
11
|
import {SmsPoints} from "../services/sms-pointes.js";
|
|
12
|
+
import { App } from '../../services/app.js';
|
|
12
13
|
|
|
13
14
|
const router: express.Router = express.Router();
|
|
14
15
|
|
|
@@ -18,7 +19,11 @@ router.get('/', async (req: express.Request, resp: express.Response) => {
|
|
|
18
19
|
try {
|
|
19
20
|
const app = req.get('g-app') as string;
|
|
20
21
|
let query: any = [];
|
|
21
|
-
|
|
22
|
+
if(req.query.app_name){
|
|
23
|
+
const brand=await App.checkBrandAndMemberType(req.query.app_name as any);
|
|
24
|
+
req.query.userID=brand.user_id
|
|
25
|
+
req.body.token.userID=brand.user_id
|
|
26
|
+
}
|
|
22
27
|
if (await UtPermission.isManager(req)) {
|
|
23
28
|
req.query.search && query.push(`(userID in (select userID from \`${app}\`.t_user where (UPPER(JSON_UNQUOTE(JSON_EXTRACT(userData, '$.name')) LIKE UPPER('%${req.query.search}%')))))`);
|
|
24
29
|
} else {
|
|
@@ -58,6 +63,7 @@ router.post('/', async (req: express.Request, resp: express.Response) => {
|
|
|
58
63
|
total: req.body.total,
|
|
59
64
|
note: req.body.note,
|
|
60
65
|
method: req.body.method,
|
|
66
|
+
app_name:req.body.app_name
|
|
61
67
|
})
|
|
62
68
|
);
|
|
63
69
|
} catch (err) {
|
|
@@ -156,6 +162,10 @@ router.delete('/withdraw', async (req: express.Request, resp: express.Response)
|
|
|
156
162
|
router.get('/sum', async (req: express.Request, resp: express.Response) => {
|
|
157
163
|
try {
|
|
158
164
|
const app = req.get('g-app') as string;
|
|
165
|
+
if(req.query.app_name){
|
|
166
|
+
const brand=await App.checkBrandAndMemberType(req.query.app_name as any);
|
|
167
|
+
req.query.userID=brand.user_id
|
|
168
|
+
}
|
|
159
169
|
return response.succ(resp, {
|
|
160
170
|
sum:
|
|
161
171
|
(
|
|
@@ -10,6 +10,7 @@ const exception_js_1 = __importDefault(require("../../modules/exception.js"));
|
|
|
10
10
|
const database_js_1 = __importDefault(require("../../modules/database.js"));
|
|
11
11
|
const redis_js_1 = __importDefault(require("../../modules/redis.js"));
|
|
12
12
|
const tool_js_1 = __importDefault(require("../../modules/tool.js"));
|
|
13
|
+
const app_js_1 = require("../../services/app.js");
|
|
13
14
|
class SmsPoints {
|
|
14
15
|
constructor(app, token) {
|
|
15
16
|
this.app = app;
|
|
@@ -22,15 +23,11 @@ class SmsPoints {
|
|
|
22
23
|
appName: this.app, key: 'glitter_finance'
|
|
23
24
|
}))[0].value);
|
|
24
25
|
const kd = keyData[keyData.TYPE];
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
"ReturnURL": `${process.env.DOMAIN}/api-public/v1/ec/redirect?g-app=${this.app}&return=${id}&type=${keyData.TYPE}`,
|
|
31
|
-
"MERCHANT_ID": kd.MERCHANT_ID,
|
|
32
|
-
TYPE: keyData.TYPE
|
|
33
|
-
});
|
|
26
|
+
if (cf.app_name) {
|
|
27
|
+
const brandAndMember = await app_js_1.App.checkBrandAndMemberType(cf.app_name);
|
|
28
|
+
this.token.userID = brandAndMember.user_id;
|
|
29
|
+
}
|
|
30
|
+
console.log(`this.token.userID==>`, this.token.userID);
|
|
34
31
|
return {
|
|
35
32
|
form: (await (new financial_service_js_1.default(this.app, {
|
|
36
33
|
"HASH_IV": kd.HASH_IV,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sms-pointes.js","sourceRoot":"","sources":["sms-pointes.ts"],"names":[],"mappings":";;;;;;AAAA,kFAAsD;AACtD,wEAAgE;AAEhE,8EAAmD;AACnD,4EAA2C;AAC3C,sEAA2C;AAC3C,oEAAyC;
|
|
1
|
+
{"version":3,"file":"sms-pointes.js","sourceRoot":"","sources":["sms-pointes.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import db from "../../modules/database.js";
|
|
|
6
6
|
import redis from "../../modules/redis.js";
|
|
7
7
|
import Tool from "../../modules/tool.js";
|
|
8
8
|
import {Invoice} from "./invoice.js";
|
|
9
|
+
import { App } from '../../services/app.js';
|
|
9
10
|
|
|
10
11
|
export class SmsPoints {
|
|
11
12
|
public app
|
|
@@ -21,23 +22,22 @@ export class SmsPoints {
|
|
|
21
22
|
return_url: string,
|
|
22
23
|
total: number,
|
|
23
24
|
note: any,
|
|
24
|
-
method?:string
|
|
25
|
+
method?:string,
|
|
26
|
+
app_name?:string
|
|
25
27
|
}) {
|
|
26
28
|
const id='redirect_'+Tool.randomString(6)
|
|
27
29
|
await redis.setValue(id,cf.return_url)
|
|
28
30
|
const keyData = ((await Private_config.getConfig({
|
|
29
31
|
appName: this.app, key: 'glitter_finance'
|
|
30
32
|
}))[0].value);
|
|
31
|
-
const kd=keyData[keyData.TYPE]
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
TYPE:keyData.TYPE
|
|
40
|
-
})
|
|
33
|
+
const kd=keyData[keyData.TYPE];
|
|
34
|
+
if(cf.app_name){
|
|
35
|
+
const brandAndMember=await App.checkBrandAndMemberType(cf.app_name as string);
|
|
36
|
+
this.token.userID=brandAndMember.user_id;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
console.log(`this.token.userID==>`,this.token.userID)
|
|
40
|
+
|
|
41
41
|
return {
|
|
42
42
|
form: (await (new FinancialService(this.app, {
|
|
43
43
|
"HASH_IV": kd.HASH_IV,
|