提交 21e7c2d5 编写于 作者: Z zhangjianjun_code

zjj update

上级 ea467684
......@@ -246,13 +246,13 @@ func (u *PackagesInfoController) Get() {
for _, gg := range gs {
var sp SubPack
sp.Name = gg.SubPackName
gsp, numx, err := models.GetSubPackProvide(gg.SubId)
if numx > 0 && err == nil {
gsp, numx, errx := models.GetSubPackProvide(gg.SubId)
if numx > 0 && errx == nil {
for _, gps := range gsp {
var ssp Provide
ssp.Name = gps.ProvideName
gspr, numxx, err := models.GetSubPackrequiredby(gps.ProvideId)
if numxx > 0 && err == nil {
gspr, numxx, errxx := models.GetSubPackrequiredby(gps.ProvideId)
if numxx > 0 && errxx == nil {
for _, grq := range gspr {
ssp.Requiredby = append(ssp.Requiredby, grq.Requiredby)
}
......
......@@ -134,13 +134,13 @@ func UpdatePackageByCveId(pkgStr string, cveId int64) error {
continue
}
pkg := Package{SecId: sec.SecId, PackName: tv}
err := o.Read(&pkg, "sec_id", "pack_name")
if err == orm.ErrNoRows {
errx := o.Read(&pkg, "sec_id", "pack_name")
if errx == orm.ErrNoRows {
pkg.PackUrl = fmt.Sprintf(`https://repo.openeuler.org/openEuler-20.03-LTS/update/aarch64/Packages/%s`, tv)
_, err = o.Insert(&pkg)
_, errx = o.Insert(&pkg)
}
}
return err
return nil
//===== 先删除 再修改 =====
/*delPkgSql := `DELETE FROM cve_package WHERE sec_id = ?`
err = o.Begin()
......
......@@ -71,7 +71,7 @@ func GetSingleYaml(ge *GitOpenEuler) (bool, error){
}
func CreateYaml(ge *GitOpenEuler) (GitId int64, typex string, err error) {
func CreateYaml(ge *GitOpenEuler) (id int64, typex string, err error) {
o := orm.NewOrm()
var localge GitOpenEuler
errx := o.Raw("select *"+
......@@ -95,7 +95,7 @@ func CreateYaml(ge *GitOpenEuler) (GitId int64, typex string, err error) {
ge.Status = 1
ge.GitId = localge.GitId
if _, err := o.Update(ge); err == nil {
logs.Info("update cve_git_open_euler success, GitId: ", GitId, "packName: ", ge.PackageName)
logs.Info("update cve_git_open_euler success, GitId: ", ge.GitId, "packName: ", ge.PackageName)
} else {
logs.Error("update cve_git_open_euler failed, ", "packName: ", ge.PackageName, "err: ", err)
return ge.GitId, "update", err
......@@ -105,7 +105,7 @@ func CreateYaml(ge *GitOpenEuler) (GitId int64, typex string, err error) {
}
func CreateYamlDetail(gp *GitPackageInfo, ge GitOpenEuler) (DetailId int64, typex string, err error) {
func CreateYamlDetail(gp *GitPackageInfo, ge GitOpenEuler) (id int64, typex string, err error) {
o := orm.NewOrm()
var localgp GitPackageInfo
errx := o.Raw("select *"+
......
<!-- HTML for static distribution bundle build -->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Swagger UI</title>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
<link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
<style>
html
{
box-sizing: border-box;
overflow: -moz-scrollbars-vertical;
overflow-y: scroll;
}
*,
*:before,
*:after
{
box-sizing: inherit;
}
body {
margin:0;
background: #fafafa;
}
</style>
</head>
<body>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
<defs>
<symbol viewBox="0 0 20 20" id="unlocked">
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
</symbol>
<symbol viewBox="0 0 20 20" id="locked">
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
</symbol>
<symbol viewBox="0 0 20 20" id="close">
<path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
</symbol>
<symbol viewBox="0 0 20 20" id="large-arrow">
<path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
</symbol>
<symbol viewBox="0 0 20 20" id="large-arrow-down">
<path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
</symbol>
<symbol viewBox="0 0 24 24" id="jump-to">
<path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
</symbol>
<symbol viewBox="0 0 24 24" id="expand">
<path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
</symbol>
</defs>
</svg>
<div id="swagger-ui"></div>
<script src="./swagger-ui-bundle.js"> </script>
<script src="./swagger-ui-standalone-preset.js"> </script>
<script>
window.onload = function() {
// Build a system
const ui = SwaggerUIBundle({
url: "swagger.json",
dom_id: '#swagger-ui',
presets: [
SwaggerUIBundle.presets.apis,
SwaggerUIStandalonePreset
],
plugins: [
SwaggerUIBundle.plugins.DownloadUrl
],
layout: "StandaloneLayout"
})
window.ui = ui
}
</script>
</body>
</html>
<!doctype html>
<html lang="en-US">
<body onload="run()">
</body>
</html>
<script>
'use strict';
function run () {
var oauth2 = window.opener.swaggerUIRedirectOauth2;
var sentState = oauth2.state;
var isValid, qp, arr;
qp = (window.location.hash || location.search).substring(1);
arr = qp.split("&")
arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
qp = qp ? JSON.parse('{' + arr.join() + '}',
function (key, value) {
return key === "" ? value : decodeURIComponent(value)
}
) : {}
isValid = qp.state === sentState
if (oauth2.auth.schema.get("flow") === "accessCode" && !oauth2.auth.code) {
if (!isValid) {
oauth2.errCb({
authId: oauth2.auth.name,
source: "auth",
level: "warning",
message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
});
}
if (qp.code) {
delete oauth2.state;
oauth2.auth.code = qp.code;
oauth2.callback(oauth2.auth);
} else {
oauth2.errCb({
authId: oauth2.auth.name,
source: "auth",
level: "error",
message: "Authorization failed: no accessCode received from the server"
});
}
} else {
oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid});
}
window.close();
}
</script>
此差异已折叠。
{"version":3,"file":"swagger-ui-bundle.js","sources":["webpack:///swagger-ui-bundle.js"],"mappings":"AAAA;AAu/FA;AA6+FA;;;;;;;;;;;;;;;;;;;;;;;;;;AAyTA;;;;;;AAoIA;AAi7FA;AAmtCA;AAi0IA;AA0oJA;AAgwFA;AAyrGA;AA0lFA;AA4nFA;AA+9CA;AA+gDA;AAwrCA;AA60EA;;;;;AA6oCA;AAsyJA;;;;;;;;;;;;;;AA64EA;AA4mIA;AAquJA;AA2qHA;AA2mGA;AAiiEA;AAq4DA;AAg3DA;AAoPA;;;;;;AAk7FA;AA07FA;;;;;AAi8CA;AAgsFA;AAs2CA;AAglCA;AAu9CA;AAy8EA;AAsiCA;AA+yFA;;;;;;;;;AAgkDA;AA2zIA;AAu7FA;AAmrFA;AAu0EA","sourceRoot":""}
\ No newline at end of file
因为 它太大了无法显示 source diff 。你可以改为 查看blob
{"version":3,"file":"swagger-ui-standalone-preset.js","sources":["webpack:///swagger-ui-standalone-preset.js"],"mappings":"AAAA;;;;;AA8QA;AAmvGA;AAuxFA;;;;;;AAocA;AAkvFA;AAu+CA;AAo+CA;AAgrCA;AAuyEA","sourceRoot":""}
\ No newline at end of file
此差异已折叠。
{"version":3,"file":"swagger-ui.css","sources":[],"mappings":"","sourceRoot":""}
\ No newline at end of file
因为 它太大了无法显示 source diff 。你可以改为 查看blob
{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;;;;;;AA0yCA;AAoyHA;AAmyHA;AAykGA;AA+9BA;AA6iCA;AAojCA;AAu5BA","sourceRoot":""}
\ No newline at end of file
{
"swagger": "2.0",
"info": {
"title": "beego Test API",
"description": "beego has a very cool tools to autogenerate documents for your API",
"version": "1.0.0",
"termsOfService": "http://beego.me/",
"contact": {
"email": "astaxie@gmail.com"
},
"license": {
"name": "Apache 2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0.html"
}
},
"basePath": "/v1",
"paths": {
"/object/": {
"get": {
"tags": [
"object"
],
"description": "get all objects",
"operationId": "ObjectController.GetAll",
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/models.Object"
}
},
"403": {
"description": ":objectId is empty"
}
}
},
"post": {
"tags": [
"object"
],
"description": "create object",
"operationId": "ObjectController.Create",
"parameters": [
{
"in": "body",
"name": "body",
"description": "The object content",
"required": true,
"schema": {
"$ref": "#/definitions/models.Object"
}
}
],
"responses": {
"200": {
"description": "{string} models.Object.Id"
},
"403": {
"description": "body is empty"
}
}
}
},
"/object/{objectId}": {
"get": {
"tags": [
"object"
],
"description": "find object by objectid",
"operationId": "ObjectController.Get",
"parameters": [
{
"in": "path",
"name": "objectId",
"description": "the objectid you want to get",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/models.Object"
}
},
"403": {
"description": ":objectId is empty"
}
}
},
"put": {
"tags": [
"object"
],
"description": "update the object",
"operationId": "ObjectController.Update",
"parameters": [
{
"in": "path",
"name": "objectId",
"description": "The objectid you want to update",
"required": true,
"type": "string"
},
{
"in": "body",
"name": "body",
"description": "The body",
"required": true,
"schema": {
"$ref": "#/definitions/models.Object"
}
}
],
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/models.Object"
}
},
"403": {
"description": ":objectId is empty"
}
}
},
"delete": {
"tags": [
"object"
],
"description": "delete the object",
"operationId": "ObjectController.Delete",
"parameters": [
{
"in": "path",
"name": "objectId",
"description": "The objectId you want to delete",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "{string} delete success!"
},
"403": {
"description": "objectId is empty"
}
}
}
},
"/user/": {
"get": {
"tags": [
"user"
],
"description": "get all Users",
"operationId": "UserController.GetAll",
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/models.User"
}
}
}
},
"post": {
"tags": [
"user"
],
"description": "create users",
"operationId": "UserController.CreateUser",
"parameters": [
{
"in": "body",
"name": "body",
"description": "body for user content",
"required": true,
"schema": {
"$ref": "#/definitions/models.User"
}
}
],
"responses": {
"200": {
"description": "{int} models.User.Id"
},
"403": {
"description": "body is empty"
}
}
}
},
"/user/login": {
"get": {
"tags": [
"user"
],
"description": "Logs user into the system",
"operationId": "UserController.Login",
"parameters": [
{
"in": "query",
"name": "username",
"description": "The username for login",
"required": true,
"type": "string"
},
{
"in": "query",
"name": "password",
"description": "The password for login",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "{string} login success"
},
"403": {
"description": "user not exist"
}
}
}
},
"/user/login/": {
"post": {
"tags": [
"user/login"
],
"description": "UserLogin",
"operationId": "UserLoginController.UserLogin",
"parameters": [
{
"in": "body",
"name": "body",
"description": "body for user content",
"required": true,
"schema": {
"$ref": "#/definitions/models.User"
}
}
],
"responses": {
"200": {
"description": "{int} models.User.Id"
},
"403": {
"description": "body is empty"
}
}
}
},
"/user/logout": {
"get": {
"tags": [
"user"
],
"description": "Logs out current logged in user session",
"operationId": "UserController.logout",
"responses": {
"200": {
"description": "{string} logout success"
}
}
}
},
"/user/upload/": {
"post": {
"tags": [
"user/upload"
],
"description": "UserUpload",
"operationId": "UserUploadController.UserUpload",
"parameters": [
{
"in": "body",
"name": "body",
"description": "body for user content",
"required": true,
"schema": {
"$ref": "#/definitions/models.CveNum"
}
}
],
"responses": {
"200": {
"description": "{int} models.User.Id"
},
"403": {
"description": "body is empty"
}
}
}
},
"/user/{uid}": {
"get": {
"tags": [
"user"
],
"description": "get user by uid",
"operationId": "UserController.Get",
"parameters": [
{
"in": "path",
"name": "uid",
"description": "The key for staticblock",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/models.User"
}
},
"403": {
"description": ":uid is empty"
}
}
},
"put": {
"tags": [
"user"
],
"description": "update the user",
"operationId": "UserController.Update",
"parameters": [
{
"in": "path",
"name": "uid",
"description": "The uid you want to update",
"required": true,
"type": "string"
},
{
"in": "body",
"name": "body",
"description": "body for user content",
"required": true,
"schema": {
"$ref": "#/definitions/models.User"
}
}
],
"responses": {
"200": {
"description": "",
"schema": {
"$ref": "#/definitions/models.User"
}
},
"403": {
"description": ":uid is not int"
}
}
},
"delete": {
"tags": [
"user"
],
"description": "delete the user",
"operationId": "UserController.Delete",
"parameters": [
{
"in": "path",
"name": "uid",
"description": "The uid you want to delete",
"required": true,
"type": "string"
}
],
"responses": {
"200": {
"description": "{string} delete success!"
},
"403": {
"description": "uid is empty"
}
}
}
}
},
"definitions": {
"models.CveNum": {
"title": "CveNum",
"type": "object"
},
"models.Object": {
"title": "Object",
"type": "object",
"properties": {
"ObjectId": {
"type": "string"
},
"PlayerName": {
"type": "string"
},
"Score": {
"type": "integer",
"format": "int64"
}
}
},
"models.Profile": {
"title": "Profile",
"type": "object",
"properties": {
"Address": {
"type": "string"
},
"Age": {
"type": "integer",
"format": "int64"
},
"Email": {
"type": "string"
},
"Gender": {
"type": "string"
}
}
},
"models.User": {
"title": "User",
"type": "object",
"properties": {
"Id": {
"type": "string"
},
"Password": {
"type": "string"
},
"Profile": {
"$ref": "#/definitions/models.Profile"
},
"Username": {
"type": "string"
}
}
}
},
"tags": [
{
"name": "object",
"description": "Operations about object\n"
},
{
"name": "user",
"description": "Operations about Users\n"
}
]
}
\ No newline at end of file
swagger: "2.0"
info:
title: beego Test API
description: beego has a very cool tools to autogenerate documents for your API
version: 1.0.0
termsOfService: http://beego.me/
contact:
email: astaxie@gmail.com
license:
name: Apache 2.0
url: http://www.apache.org/licenses/LICENSE-2.0.html
basePath: /v1
paths:
/object/:
get:
tags:
- object
description: get all objects
operationId: ObjectController.GetAll
responses:
"200":
description: ""
schema:
$ref: '#/definitions/models.Object'
"403":
description: :objectId is empty
post:
tags:
- object
description: create object
operationId: ObjectController.Create
parameters:
- in: body
name: body
description: The object content
required: true
schema:
$ref: '#/definitions/models.Object'
responses:
"200":
description: '{string} models.Object.Id'
"403":
description: body is empty
/object/{objectId}:
get:
tags:
- object
description: find object by objectid
operationId: ObjectController.Get
parameters:
- in: path
name: objectId
description: the objectid you want to get
required: true
type: string
responses:
"200":
description: ""
schema:
$ref: '#/definitions/models.Object'
"403":
description: :objectId is empty
put:
tags:
- object
description: update the object
operationId: ObjectController.Update
parameters:
- in: path
name: objectId
description: The objectid you want to update
required: true
type: string
- in: body
name: body
description: The body
required: true
schema:
$ref: '#/definitions/models.Object'
responses:
"200":
description: ""
schema:
$ref: '#/definitions/models.Object'
"403":
description: :objectId is empty
delete:
tags:
- object
description: delete the object
operationId: ObjectController.Delete
parameters:
- in: path
name: objectId
description: The objectId you want to delete
required: true
type: string
responses:
"200":
description: '{string} delete success!'
"403":
description: objectId is empty
/user/:
get:
tags:
- user
description: get all Users
operationId: UserController.GetAll
responses:
"200":
description: ""
schema:
$ref: '#/definitions/models.User'
post:
tags:
- user
description: create users
operationId: UserController.CreateUser
parameters:
- in: body
name: body
description: body for user content
required: true
schema:
$ref: '#/definitions/models.User'
responses:
"200":
description: '{int} models.User.Id'
"403":
description: body is empty
/user/{uid}:
get:
tags:
- user
description: get user by uid
operationId: UserController.Get
parameters:
- in: path
name: uid
description: The key for staticblock
required: true
type: string
responses:
"200":
description: ""
schema:
$ref: '#/definitions/models.User'
"403":
description: :uid is empty
put:
tags:
- user
description: update the user
operationId: UserController.Update
parameters:
- in: path
name: uid
description: The uid you want to update
required: true
type: string
- in: body
name: body
description: body for user content
required: true
schema:
$ref: '#/definitions/models.User'
responses:
"200":
description: ""
schema:
$ref: '#/definitions/models.User'
"403":
description: :uid is not int
delete:
tags:
- user
description: delete the user
operationId: UserController.Delete
parameters:
- in: path
name: uid
description: The uid you want to delete
required: true
type: string
responses:
"200":
description: '{string} delete success!'
"403":
description: uid is empty
/user/login:
get:
tags:
- user
description: Logs user into the system
operationId: UserController.Login
parameters:
- in: query
name: username
description: The username for login
required: true
type: string
- in: query
name: password
description: The password for login
required: true
type: string
responses:
"200":
description: '{string} login success'
"403":
description: user not exist
/user/login/:
post:
tags:
- user/login
description: UserLogin
operationId: UserLoginController.UserLogin
parameters:
- in: body
name: body
description: body for user content
required: true
schema:
$ref: '#/definitions/models.User'
responses:
"200":
description: '{int} models.User.Id'
"403":
description: body is empty
/user/logout:
get:
tags:
- user
description: Logs out current logged in user session
operationId: UserController.logout
responses:
"200":
description: '{string} logout success'
/user/upload/:
post:
tags:
- user/upload
description: UserUpload
operationId: UserUploadController.UserUpload
parameters:
- in: body
name: body
description: body for user content
required: true
schema:
$ref: '#/definitions/models.CveNum'
responses:
"200":
description: '{int} models.User.Id'
"403":
description: body is empty
definitions:
models.CveNum:
title: CveNum
type: object
models.Object:
title: Object
type: object
properties:
ObjectId:
type: string
PlayerName:
type: string
Score:
type: integer
format: int64
models.Profile:
title: Profile
type: object
properties:
Address:
type: string
Age:
type: integer
format: int64
Email:
type: string
Gender:
type: string
models.User:
title: User
type: object
properties:
Id:
type: string
Password:
type: string
Profile:
$ref: '#/definitions/models.Profile'
Username:
type: string
tags:
- name: object
description: |
Operations about object
- name: user
description: |
Operations about Users
......@@ -118,8 +118,8 @@ func UpdateCveGroups(cveData models.OriginUpstream, cveRef string, openeulernum
logs.Info("insert cve_score success scid: ", scid, "CveNum:", cveData.CveNum)
}
}
SecNOtice, secerr := models.QuerySecNoticeByCveId(CveRes.CveId)
if secerr {
SecNOtice, secerrx := models.QuerySecNoticeByCveId(CveRes.CveId)
if secerrx {
SecNOtice.InfluenceComponent = cveData.AffectProduct
SecNOtice.OpenId = OpenEulId
SecNOtice.Summary = cveData.AffectProduct + " security update"
......@@ -142,7 +142,7 @@ func UpdateCveGroups(cveData models.OriginUpstream, cveRef string, openeulernum
logs.Info("insert cve_security_notice success secid: , cveNum: ", secid, cveData.CveNum)
}
}
if scoreerr && secerr {
if scoreerr && secerrx {
errx := models.UpdateCveRelat(&CveRes, &SecNOtice, &scoreRes)
if errx != nil {
logs.Error("update (&CveRes, &SecNOtice, &scoreRes) failed CveNum:", cveData.CveNum)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册