|
@@ -4,12 +4,13 @@ import { HttpClient, HttpHeaders } from "@angular/common/http";
|
4
|
4
|
import host from "../../assets/js/http";
|
5
|
5
|
import { Observable } from "rxjs";
|
6
|
6
|
import { AES, mode, pad, enc } from "crypto-js";
|
|
7
|
+import { MarkingService } from './marking.service';
|
7
|
8
|
|
8
|
9
|
@Injectable({
|
9
|
10
|
providedIn: "root",
|
10
|
11
|
})
|
11
|
12
|
export class MainService {
|
12
|
|
- constructor(private http: HttpClient) {}
|
|
13
|
+ constructor(private http: HttpClient, private markingService: MarkingService) {}
|
13
|
14
|
|
14
|
15
|
headers = new HttpHeaders({
|
15
|
16
|
"Content-Type": "application/json",
|
|
@@ -34,14 +35,17 @@ export class MainService {
|
34
|
35
|
}
|
35
|
36
|
// 登录
|
36
|
37
|
login(name: string, pwd: string): any {
|
37
|
|
- let loginData = {
|
|
38
|
+ let data:any = {
|
38
|
39
|
username: name,
|
39
|
40
|
password: pwd,
|
40
|
41
|
type: "PC",
|
41
|
42
|
};
|
42
|
|
- let data = {
|
43
|
|
- k: this.encryptByEnAES(JSON.stringify(loginData))
|
44
|
|
- };
|
|
43
|
+ // 同济登录不加密
|
|
44
|
+ if(this.markingService.marking !== 'tongji'){
|
|
45
|
+ data = {
|
|
46
|
+ k: this.encryptByEnAES(JSON.stringify(data))
|
|
47
|
+ };
|
|
48
|
+ }
|
45
|
49
|
return this.http.post(host.host + "/auth/login", data, {
|
46
|
50
|
headers: this.headers,
|
47
|
51
|
});
|