Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
16455da3
Commit
16455da3
authored
Sep 09, 2020
by
王悦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
90b73b1a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
3 deletions
+25
-3
zhiquanquan/app/base/controller/impl/trademark/searchCtl.js
+1
-1
zhiquanquan/app/base/db/models/trademark/excel.js
+21
-0
zhiquanquan/app/base/db/models/trademark/trademark.js
+1
-0
zhiquanquan/app/config/settings.js
+2
-2
No files found.
zhiquanquan/app/base/controller/impl/trademark/searchCtl.js
View file @
16455da3
...
...
@@ -5,7 +5,7 @@ let settings = require("../../../../config/settings");
const
CtlBase
=
require
(
"../../ctl.base"
);
const
logCtl
=
system
.
getObject
(
"web.common.oplogCtl"
);
const
tmtransactionPath
=
"/api/action/tmQuery/springBoard"
;
const
tmurl
=
settings
.
c
hannelApi
Url
()
+
tmtransactionPath
;
const
tmurl
=
settings
.
c
enterChannel
Url
()
+
tmtransactionPath
;
//标源检索
class
searchCtl
extends
CtlBase
{
constructor
()
{
...
...
zhiquanquan/app/base/db/models/trademark/excel.js
0 → 100644
View file @
16455da3
const
system
=
require
(
"../../../system"
);
const
settings
=
require
(
"../../../../config/settings"
);
const
appconfig
=
system
.
getSysConfig
();
module
.
exports
=
(
db
,
DataTypes
)
=>
{
return
db
.
define
(
"excel"
,
{
status
:
DataTypes
.
INTEGER
,
},
{
paranoid
:
true
,
//假的删除
underscored
:
true
,
version
:
true
,
freezeTableName
:
true
,
//freezeTableName: true,
// define the table's name
tableName
:
'excel_upload'
,
validate
:
{
},
indexes
:
[
]
});
};
zhiquanquan/app/base/db/models/trademark/trademark.js
View file @
16455da3
...
...
@@ -5,6 +5,7 @@ module.exports = (db, DataTypes) => {
return
db
.
define
(
"trademark"
,
{
user_id
:
DataTypes
.
INTEGER
,
//平台用户id
company_id
:
DataTypes
.
INTEGER
,
//平台公司id
upload_id
:
DataTypes
.
INTEGER
,
//上传id
trademark_id
:
DataTypes
.
INTEGER
,
//标源id
tm_code
:
DataTypes
.
STRING
,
//商标申请号
opath
:
DataTypes
.
STRING
,
//用户路径
...
...
zhiquanquan/app/config/settings.js
View file @
16455da3
...
...
@@ -45,7 +45,7 @@ var settings = {
if
(
this
.
env
==
"dev"
)
{
return
"http://alitm.qifu-dev.gongsibao.com"
;
}
else
{
return
"http://
alitm.qifu.gongsibao.com
"
;
return
"http://
zcapi-service.chaolai
"
;
}
},
centerChannelUrl
:
function
()
{
//---------center-channel
...
...
@@ -53,7 +53,7 @@ var settings = {
// return "http://gsbweb.qifu-dev.gongsibao.com";//localsettings.reqEsDevUrl;
return
"http://gsbweb.qifu-dev.gongsibao.com"
;
}
else
{
return
"http://
gsbweb.qifu.gongsibao.com
"
;
return
"http://
center-channel-service.chaolai
"
;
}
},
uploadfileossurl
:
function
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment