Skip to content

Commit c0eebf0

Browse files
authored
fix(all): version 0.7.1 (#545)
1 parent 43203a8 commit c0eebf0

22 files changed

Lines changed: 202 additions & 65 deletions

File tree

dev/release/mysql/buildx-release-mysql.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# or implied.
1111

1212
docker buildx build -f Dockerfile --platform linux/arm64/v8,linux/amd64 --push \
13-
-t spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-mysql:0.6 \
13+
-t spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-mysql:0.7 \
1414
-t spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-mysql:latest \
1515
-t openspg/openspg-mysql:0.5.1 \
1616
-t openspg/openspg-mysql:latest \

dev/release/python/Dockerfile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,3 @@ RUN . /etc/profile && echo ${JAVA_HOME} && mkdir -p /home/admin/ && chmod -R 777
5050
pip install openspg-kag==0.7.0 &&\
5151
pip install pemja==0.4.0 && \
5252
pip cache purge
53-
54-
55-
# RUN python3 -m venv /openspg_venv && \
56-
# . /openspg_venv/bin/activate && \
57-
# export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture) && \
58-
# pip3 install openspg-kag==0.6.0b9 -i https://artifacts.antgroup-inc.cn/artifact/repositories/simple-dev/ && \
59-
# pip3 install pemja==0.4.0 && \
60-
# pip3 install -U "http://alps-common.oss-cn-hangzhou-zmf.aliyuncs.com/nscommon/shiji/nscommon-0.0.1.tar.gz" && \
61-
# echo "if (tty -s); then \n . /openspg_venv/bin/activate \nfi" >> ~/.bashrc
62-
63-
# ADD openspg/dev/release/python/lib/builder*.jar /home/admin/miniconda3/lib/python3.10/site-packages/knext/builder/lib

dev/release/python/build-release-python-aliyun.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# or implied.
1111
alias docker=podman
1212
IMAGE="spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-python"
13-
VERSION="0.6"
13+
VERSION="0.7"
1414
LATEST="latest"
1515

1616
cd ../../../../

dev/release/python/build-release-python.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
# for amd64
1313
docker build -f Dockerfile --platform linux/amd64 --push \
14-
-t spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-python:0.5.1 \
14+
-t spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-python:0.7 \
1515
-t spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-python:latest \
16-
-t openspg/openspg-python:0.5.1 \
16+
-t openspg/openspg-python:0.7 \
1717
-t openspg/openspg-python:latest \
1818
.

dev/release/server/buildx-release-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
# or implied.
1111

1212
docker buildx build -f Dockerfile --platform linux/arm64/v8,linux/amd64 --push \
13-
-t spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-server:0.6 \
13+
-t spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-server:0.7 \
1414
-t spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-server:latest \
1515
.

dev/test/docker-compose.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,18 @@ services:
3838
volumes:
3939
- /etc/localtime:/etc/localtime:ro
4040
- $HOME/dozerdb/logs:/logs
41+
42+
minio:
43+
image: spg-registry.cn-hangzhou.cr.aliyuncs.com/spg/openspg-minio:latest
44+
container_name: release-openspg-minio
45+
command: server --console-address ":9001" /data
46+
restart: always
47+
environment:
48+
MINIO_ACCESS_KEY: minio
49+
MINIO_SECRET_KEY: minio@openspg
50+
TZ: Asia/Shanghai
51+
ports:
52+
- 9000:9000
53+
- 9001:9001
54+
volumes:
55+
- /etc/localtime:/etc/localtime:ro

server/api/facade/src/main/java/com/antgroup/openspg/server/api/facade/dto/common/request/KagBuilderRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public class KagBuilderRequest extends BaseRequest {
3636

3737
private Integer workerGpu;
3838

39+
private String workerGpuType;
40+
3941
private Integer workerMemory;
4042

4143
private Integer workerStorage;

server/arks/sofaboot/src/main/resources/config/application-default.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# | server |
1616
# * ----------------------- */
1717
# spring
18+
env=default
1819
spring.application.name=openspg
1920
spring.servlet.multipart.max-file-size=100GB
2021
spring.servlet.multipart.max-request-size=100GB

server/common/service/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,5 +150,9 @@
150150
<version>0.36.4-public</version>
151151
</dependency>
152152
<!-- dataSource end -->
153+
<dependency>
154+
<groupId>org.springframework.boot</groupId>
155+
<artifactId>spring-boot-autoconfigure</artifactId>
156+
</dependency>
153157
</dependencies>
154158
</project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
package com.antgroup.openspg.server.common.service.account.impl;
2+
3+
import com.antgroup.openspg.server.api.facade.Paged;
4+
import com.antgroup.openspg.server.api.http.client.account.AccountService;
5+
import com.antgroup.openspg.server.common.model.account.Account;
6+
import java.io.IOException;
7+
import java.util.List;
8+
import javax.servlet.http.Cookie;
9+
import javax.servlet.http.HttpServletResponse;
10+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
11+
import org.springframework.stereotype.Service;
12+
13+
@Service
14+
@ConditionalOnProperty(name = "env", havingValue = "default")
15+
public class AccountServiceDefaultImpl implements AccountService {
16+
17+
@Override
18+
public Account getLoginUser() {
19+
return null;
20+
}
21+
22+
@Override
23+
public List<Account> getAccountByKeyword(String keyword) {
24+
return null;
25+
}
26+
27+
@Override
28+
public Account getByUserNo(String userNo) {
29+
return null;
30+
}
31+
32+
@Override
33+
public Account getWithPrivateByUserNo(String userNo) {
34+
return null;
35+
}
36+
37+
@Override
38+
public Integer create(Account account) {
39+
return null;
40+
}
41+
42+
@Override
43+
public Integer updatePassword(Account account) {
44+
return null;
45+
}
46+
47+
@Override
48+
public Integer deleteAccount(String workNo) {
49+
return null;
50+
}
51+
52+
@Override
53+
public Paged<Account> getAccountList(String account, Integer page, Integer size) {
54+
return null;
55+
}
56+
57+
@Override
58+
public String getSha256HexPassword(String password, String salt) {
59+
return null;
60+
}
61+
62+
@Override
63+
public Account getCurrentAccount(Cookie[] cookies) throws IOException {
64+
return null;
65+
}
66+
67+
@Override
68+
public boolean login(Account account, HttpServletResponse response) {
69+
return false;
70+
}
71+
72+
@Override
73+
public String logout(String workNo, String redirectUrl) {
74+
return null;
75+
}
76+
77+
@Override
78+
public int updateUserConfig(Account account, Cookie[] cookies) {
79+
return 0;
80+
}
81+
}

0 commit comments

Comments
 (0)