Skip to content
This repository was archived by the owner on Mar 1, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
26f5c2f
refactor ashe
iamtmoe Aug 8, 2018
b5981d4
replace logo
zkn111 Aug 9, 2018
5a4c7ff
delete drivers,add service/drivers/email.js
iamtmoe Aug 9, 2018
e0f1df3
fix admin logo
iamtmoe Aug 9, 2018
ace4283
Merge pull request #78 from zkn111/seo
leohihimax Aug 10, 2018
c4b7a75
fix eslint,delete app/tools/memclient.js
iamtmoe Aug 10, 2018
0f4fbac
delete temp,gitignore add .vscode
iamtmoe Aug 10, 2018
a0ed3aa
Delete launch.json
iamtmoe Aug 10, 2018
dba90ab
.gitignore .vscode改为.vscode/
iamtmoe Aug 10, 2018
3c80ec3
Merge branch 'develop2' of github.com:iamtmoe/Ashe into dev
iamtmoe Aug 10, 2018
bbb8bbe
remove ctx.checkbody,use egg-validate
iamtmoe Aug 13, 2018
bc6eba4
local master merge local dev
iamtmoe Aug 13, 2018
5f693a4
add error_handler middleware
iamtmoe Aug 14, 2018
1b7a8fa
modify company name
zkn111 Aug 15, 2018
036e41b
拆分成两个egg项目
iamtmoe Aug 15, 2018
cb931e6
修改.gitignore和package.json
iamtmoe Aug 15, 2018
c296a6d
modify .gitmodules
iamtmoe Aug 15, 2018
dac5809
remove www-admin/admin/uskin/*
iamtmoe Aug 15, 2018
651ed4e
try to fix submodule bug
iamtmoe Aug 15, 2018
31026b9
submodule problem
iamtmoe Aug 15, 2018
b97b01e
Merge pull request #80 from zkn111/seo
leohihimax Aug 15, 2018
6c4e1f5
Added .gitreview
Aug 16, 2018
a557680
optimize first screen
AnonymousShao Aug 16, 2018
76df85d
删去git仓库该忽略的文件
iamtmoe Aug 20, 2018
bc65106
删掉package.json多余的script
iamtmoe Aug 20, 2018
8467562
Squashed commit of the following:
Aug 20, 2018
ca175fe
correct package.json
Aug 20, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 0 additions & 4 deletions .babelrc

This file was deleted.

29 changes: 18 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Logs
logs
/**/logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.idea

# Runtime data
pids
Expand Down Expand Up @@ -33,7 +34,7 @@ bower_components
build/Release

# Dependency directories
node_modules/
/**/node_modules/
jspm_packages/

# Typescript v1 declaration files
Expand Down Expand Up @@ -61,30 +62,30 @@ typings/
.DS_Store

# Dist file
client/static/dist/*
client/static/assets/*
www/client/static/dist/*
www/client/static/assets/*

# uploads
static/wp-content/*

# routers list
client/.routers.json
www/client/.routers.json

# Icon fonts assets
client/static/iconfonts/fonts
www/client/static/iconfonts/fonts

# static html files
client/static/html
www/client/static/html

# common css
client/static/common/style/*.css
www/client/static/common/style/*.css

# common js
client/static/common/js/*.g.js
www/client/static/common/js/*.g.js

# admin dist and manifest file
admin/dist/
admin/manifest.json
www-admin/admin/dist/
www-admin/admin/manifest.json

# config file
config/index.js
Expand All @@ -93,3 +94,9 @@ config/index.js
package-lock.json

nginx_conf/*

#run file
run/

#vscode
.vscode/
5 changes: 3 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "admin/uskin"]
path = admin/uskin
[submodule "www-admin/admin/uskin"]
path = www-admin/admin/uskin
url = https://github.com/unitedstack/uskin.git

4 changes: 4 additions & 0 deletions .gitreview
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[gerrit]
host=review.ustack.com
port=29418
project=ued/ashe.git
1 change: 0 additions & 1 deletion admin/uskin
Submodule uskin deleted from 84281f
33 changes: 33 additions & 0 deletions config/default.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
module.exports = ({
keys:'tmoe',
sequelize:{
dialect: 'mysql', // support: mysql, mariadb, postgres, mssql
database: 'ashe',
host: 'localhost',
port: '3306',
username: 'root',
password: '1234',
},
security:{
csrf:{
enable:false
}
},
smtp: {
host: 'smtp.qq.com',
port: 465,
secure: true,
auth: {
user: '',
pass: ''
}
},
emailTemplate: {
logoUrl: 'https://www.tfcloud.com/static/assets/logo1.png',
homeUrl: 'https://www.tfcloud.com',
corporationName: 'TFCloud Inc. - www.tfcloud.com'
},
emailAddress: {
contact: 'contact@unitedstack.com'
}
});
68 changes: 0 additions & 68 deletions config/index.js.sample

This file was deleted.

18 changes: 0 additions & 18 deletions index.js

This file was deleted.

89 changes: 0 additions & 89 deletions nginx_conf/mime.types

This file was deleted.

Loading